summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-10-30Git 1.8.5-rc0v1.8.5-rc0Junio C Hamano2-1/+24
2013-10-30Merge branch 'maint'Junio C Hamano0-0/+0
2013-10-30Merge branch 'jk/refs-c-squelch-gcc'Junio C Hamano1-1/+1
2013-10-30Merge branch 'jk/date-c-double-semicolon'Junio C Hamano1-1/+1
2013-10-30Merge branch 'nd/lift-path-max'Junio C Hamano3-6/+18
2013-10-30Merge branch 'tr/valgrind-test-fix'Junio C Hamano1-99/+34
2013-10-30Merge branch 'tr/gitk-doc-update'Junio C Hamano1-24/+83
2013-10-30Merge branch 'jl/pack-transfer-avoid-double-close'Junio C Hamano2-0/+8
2013-10-30Merge branch 'sb/git-svn-docs-indent-with-ht'Junio C Hamano1-13/+13
2013-10-30Merge branch 'nd/magic-pathspec'Junio C Hamano3-2/+19
2013-10-30Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2-0/+29
2013-10-30Merge branch 'hn/log-graph-color-octopus'Junio C Hamano1-2/+2
2013-10-30Merge branch 'mm/checkout-auto-track-fix'Junio C Hamano3-28/+98
2013-10-30Merge branch 'sg/t3600-nul-sha1-fix'Junio C Hamano1-7/+4
2013-10-30Merge branch 'fc/styles'Junio C Hamano11-18/+19
2013-10-30Merge branch 'jc/upload-pack-send-symref'Junio C Hamano6-22/+125
2013-10-30Merge branch 'jk/http-auth-redirects'Junio C Hamano7-65/+191
2013-10-30t5570: Update for clone-progress-to-stderr branchBrian Gernhardt1-2/+1
2013-10-28Almost -rc0 for 1.8.5Junio C Hamano1-0/+15
2013-10-28Sync with v1.8.4.2Junio C Hamano4-3/+18
2013-10-28Merge branch 'sb/repack-in-c'Junio C Hamano1-1/+1
2013-10-28Merge branch 'sg/prompt-svn-remote-fix'Junio C Hamano1-1/+1
2013-10-28Merge branch 'jk/split-broken-ident'Junio C Hamano2-3/+22
2013-10-28Merge branch 'jk/remote-literal-string-leakfix'Junio C Hamano1-1/+1
2013-10-28Merge branch 'ew/keepalive'Junio C Hamano1-0/+38
2013-10-28Merge branch 'jc/revision-range-unpeel'Junio C Hamano2-22/+45
2013-10-28Merge branch 'jx/relative-path-regression-fix'Junio C Hamano4-32/+99
2013-10-28Git 1.8.4.2v1.8.4.2Junio C Hamano3-2/+17
2013-10-28Merge branch 'jk/clone-progress-to-stderr' into maintJunio C Hamano4-28/+32
2013-10-28Merge branch 'jk/format-patch-from' into maintJunio C Hamano4-1/+49
2013-10-28Merge branch 'jk/shortlog-tolerate-broken-commit' into maintJunio C Hamano2-2/+20
2013-10-28Merge branch 'jk/diff-algo' into maintJunio C Hamano1-2/+2
2013-10-28test-lib: fix typo in commentTorstein Hegge1-1/+1
2013-10-28sha1_file: move comment about return value where it belongsChristian Couder1-1/+1
2013-10-24silence gcc array-bounds warningJeff King1-1/+1
2013-10-24drop redundant semicolon in empty whileJeff King1-1/+1
2013-10-24checkout_entry(): clarify the use of topath[] parameterJunio C Hamano3-1/+10
2013-10-24entry.c: convert checkout_entry to use strbufNguyễn Thái Ngọc Duy1-5/+8
2013-10-24http.c: Spell the null pointer as NULLRamsay Jones1-1/+1
2013-10-23Update draft release notes to 1.8.5Junio C Hamano1-0/+4
2013-10-23Sync with 'maint'Junio C Hamano1-0/+13
2013-10-23Almost 1.8.4.2 ;-)Junio C Hamano1-0/+13
2013-10-23Merge branch 'jc/ls-files-killed-optim' into maintJunio C Hamano4-17/+67
2013-10-23Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano4-8/+45
2013-10-23Merge branch 'nd/fetch-into-shallow' into maintJunio C Hamano12-160/+152
2013-10-23Merge branch 'bc/gnome-keyring'Junio C Hamano2-134/+167
2013-10-23Merge branch 'po/dot-url'Junio C Hamano2-2/+8
2013-10-23Merge branch 'jc/prompt-upstream'Junio C Hamano1-1/+6
2013-10-23Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2-2/+14
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano14-57/+237
2013-10-23Merge branch 'jc/pack-objects'Junio C Hamano1-11/+12
2013-10-23Clear fd after closing to avoid double-close errorJens Lindstrom2-0/+8
2013-10-22Revert "test-lib: allow prefixing a custom string before "ok N" etc."Thomas Rast1-15/+12
2013-10-22Revert "test-lib: support running tests under valgrind in parallel"Thomas Rast1-84/+22
2013-10-22git-svn docs: Use tabs consistently within the ascii docStefan Beller1-13/+13
2013-10-22t5570: Update for clone-progress-to-stderr branchBrian Gernhardt1-2/+1
2013-10-22Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symrefJunio C Hamano4-28/+32
2013-10-22t5570: Update for symref capabilityBrian Gernhardt1-1/+1
2013-10-22Documentation: revamp gitk(1)Thomas Rast1-24/+83
2013-10-22Reword repack documentation to no longer state it's a scriptStefan Beller1-1/+1
2013-10-22Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flagsNguyễn Thái Ngọc Duy3-2/+19
2013-10-18Update draft release notes to 1.8.5Junio C Hamano1-0/+7
2013-10-18Merge branch 'maint'Junio C Hamano1-1/+5
2013-10-18Merge branch 'jc/reflog-doc'Junio C Hamano3-3/+49
2013-10-18Merge branch 'sb/repack-in-c'Junio C Hamano5-1/+391
2013-10-18Merge branch 'jk/clone-progress-to-stderr'Junio C Hamano4-28/+32
2013-10-18Merge git://github.com/git-l10n/git-poJunio C Hamano1-2367/+3193
2013-10-18checkout: proper error message on 'git checkout foo bar --'Matthieu Moy2-5/+22
2013-10-18checkout: allow dwim for branch creation for "git checkout $branch --"Matthieu Moy2-23/+76
2013-10-18graph: fix coloring around octopus mergesHemmo Nieminen1-2/+2
2013-10-18git-merge: document the -S optionNicolas Vigier1-1/+5
2013-10-18gc: remove gc.pid file at end of executionJonathan Nieder2-0/+29
2013-10-18l10n: fr.po: 2135/2135 messages translatedJean-Noel Avila1-2367/+3193
2013-10-17Update draft release notes to 1.8.5Junio C Hamano1-0/+4
2013-10-17Merge branch 'jk/format-patch-from'Junio C Hamano4-1/+49
2013-10-17Merge branch 'es/name-hash-no-trailing-slash-in-dirs'Junio C Hamano5-51/+50
2013-10-17Merge branch 'jk/trailing-slash-in-pathspec'Junio C Hamano3-20/+14
2013-10-17Merge branch 'lc/filter-branch-too-many-refs'Junio C Hamano1-2/+2
2013-10-17Merge branch 'jc/checkout-detach-doc'Junio C Hamano1-6/+8
2013-10-17Sync with maintJunio C Hamano2-21/+65
2013-10-17Start preparing for 1.8.4.2Junio C Hamano2-1/+51
2013-10-17Merge branch 'jk/upload-pack-keepalive' into maintJunio C Hamano2-1/+35
2013-10-17Merge branch 'bc/http-backend-allow-405' into maintJunio C Hamano1-2/+4
2013-10-17Merge branch 'jc/cvsserver-perm-bit-fix' into maintJunio C Hamano1-1/+1
2013-10-17Merge branch 'js/add-i-mingw' into maintJunio C Hamano1-1/+1
2013-10-17Merge branch 'nd/git-dir-pointing-at-gitfile' into maintJunio C Hamano2-5/+8
2013-10-17Merge branch 'jk/has-sha1-file-retry-packed' into maintJunio C Hamano1-1/+4
2013-10-17Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2-1/+18
2013-10-17Merge branch 'es/rebase-i-no-abbrev' into maintJunio C Hamano2-2/+117
2013-10-17Merge branch 'rt/rebase-p-no-merge-summary' into maintJunio C Hamano2-1/+25
2013-10-17Merge branch 'es/rebase-i-respect-core-commentchar' into maintJunio C Hamano1-1/+1
2013-10-17t4254: modernize testsSZEDER Gábor1-21/+15
2013-10-16Update draft release notes to 1.8.5Junio C Hamano1-0/+30
2013-10-16t3600: fix broken "choking git rm" testSZEDER Gábor1-7/+4
2013-10-16http: use curl's tcp keepalive if availableJeff King1-4/+20
2013-10-16Merge git://git.bogomips.org/git-svnJunio C Hamano3-25/+146
2013-10-16block-sha1/sha1.c: have SP around arithmetic operatorsJunio C Hamano1-2/+2
2013-10-16base85.c: have SP around arithmetic operatorsJunio C Hamano1-1/+1
2013-10-16archive.c: have SP around arithmetic operatorsJunio C Hamano1-1/+1
2013-10-16alloc.c: have SP around arithmetic operatorsJunio C Hamano1-1/+1
2013-10-16abspath.c: have SP around arithmetic operatorsJunio C Hamano1-2/+2
2013-10-16alias: have SP around arithmetic operatorsFelipe Contreras1-6/+7
2013-10-16C: have space around && and || operatorsJunio C Hamano5-5/+5
2013-10-16contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyringBrandon Casey1-0/+39
2013-10-16contrib/git-credential-gnome-keyring.c: support ancient gnome-keyringBrandon Casey1-0/+58
2013-10-16contrib/git-credential-gnome-keyring.c: report failure to store passwordBrandon Casey1-1/+9
2013-10-16contrib/git-credential-gnome-keyring.c: use glib messaging functionsBrandon Casey1-29/+4
2013-10-16contrib/git-credential-gnome-keyring.c: use glib memory allocation functionsBrandon Casey1-32/+16
2013-10-16contrib/git-credential-gnome-keyring.c: use secure memory for reading passwordsBrandon Casey1-3/+9
2013-10-16contrib/git-credential-gnome-keyring.c: use secure memory functions for passwdsBrandon Casey1-15/+6
2013-10-16contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()Brandon Casey1-11/+3
2013-10-16contrib/git-credential-gnome-keyring.c: set Gnome application nameBrandon Casey2-2/+5
2013-10-16contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before acc...Brandon Casey1-1/+1
2013-10-16contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_tBrandon Casey1-1/+1
2013-10-16contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectlyBrandon Casey1-1/+1
2013-10-16contrib/git-credential-gnome-keyring.c: add static where applicableBrandon Casey1-9/+9
2013-10-16contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc.Brandon Casey1-10/+10
2013-10-15revision: do not peel tags used in range notationJunio C Hamano2-22/+45
2013-10-15Merge branch 'maint'Junio C Hamano3-2/+12
2013-10-15git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORYSteffen Prohaska1-1/+1
2013-10-15git.txt: fix asciidoc syntax of --*-pathspecsSteffen Prohaska1-3/+3
2013-10-15doc/cli: make "dot repository" an independent bullet pointPhilip Oakley1-4/+4
2013-10-15remote: do not copy "origin" string literalJeff King1-1/+1
2013-10-15bash prompt: don't use '+=' operator in show upstream code pathSZEDER Gábor1-1/+1
2013-10-15split_ident: parse timestamp from end of lineJeff King2-3/+22
2013-10-14remote-curl: rewrite base url from info/refs redirectsJeff King4-1/+19
2013-10-14remote-curl: store url as a strbufJeff King1-19/+19
2013-10-14remote-curl: make refs_url a strbufJeff King1-8/+7
2013-10-14http: update base URLs when we see redirectsJeff King2-0/+68
2013-10-14http: provide effective url to callersJeff King2-0/+10
2013-10-14http: hoist credential request out of handle_curl_resultJeff King3-3/+11
2013-10-14mergetool--lib: Fix typo in the merge/difftool helpStefan Saasen1-1/+1
2013-10-14sparse: suppress some "using sizeof on a function" warningsRamsay Jones1-0/+3
2013-10-14format-patch doc: Thunderbird wraps lines unless mailnews.wraplength=0Ramsay Jones1-1/+2
2013-10-14Merge branch 'rj/highlight-test-hang'Jonathan Nieder1-2/+4
2013-10-14gitweb test: fix highlight test hang on Linux MintRamsay Jones1-2/+4
2013-10-14wrapper.c: only define gitmkstemps if neededRamsay Jones1-0/+2
2013-10-14refs.c: spell NULL pointer as NULLRamsay Jones1-1/+1
2013-10-14config.c: mark file-local function staticRamsay Jones1-1/+1
2013-10-14CodingGuidelines: style for multi-line commentsbrian m. carlson1-0/+8
2013-10-14Merge branch 'nv/doc-config-signingkey'Jonathan Nieder1-5/+5
2013-10-14config doc: user.signingkey is also used for signed commitsNicolas Vigier1-5/+5
2013-10-14clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2-1/+11
2013-10-14Merge branch 'sb/checkout-test-complex-path'Jonathan Nieder1-7/+7
2013-10-14Merge branch 'rt/cherry-pick-status'Jonathan Nieder3-11/+17
2013-10-14Merge branch 'rj/doc-formatting-fix'Jonathan Nieder2-6/+6
2013-10-14Merge branch 'po/remote-set-head-usage'Jonathan Nieder2-5/+5
2013-10-14Merge branch 'nd/clone-local-with-colon'Jonathan Nieder2-2/+46
2013-10-14Merge branch 'jx/clean-interactive'Jonathan Nieder2-3/+3
2013-10-14Merge branch 'jk/diff-algo'Jonathan Nieder1-2/+2
2013-10-14git-prompt.sh: optionally show upstream branch nameJulien Carsique1-1/+6
2013-10-14path-utils test: rename mingw_path function to print_pathSebastian Schuberth2-3/+3
2013-10-14howto/revert-a-faulty-merge: fix unescaped '^'sRamsay Jones1-4/+4
2013-10-14howto/setup-git-server-over-http: fix unescaped '^'sRamsay Jones1-2/+2
2013-10-14http: enable keepalive on TCP socketsEric Wong1-0/+22
2013-10-14Use simpler relative_path when set_git_dirJiang Xin3-4/+47
2013-10-14relative_path should honor dos-drive-prefixJiang Xin2-0/+24
2013-10-14test: use unambigous leading path (/foo) for MSYSJiang Xin1-28/+28
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen3-2/+18
2013-10-13.mailmap: switch to Thomas Rast's personal addressThomas Rast1-1/+3
2013-10-12git-svn: Warn about changing default for --prefix in Git v2.0Johan Herland3-2/+88
2013-10-12Documentation/git-svn: Promote the use of --prefix in docs + examplesJohan Herland1-10/+25
2013-10-11status: show commit sha1 in "You are currently cherry-picking" messageRalf Thielow3-6/+12
2013-10-11status test: add missing && to <<EOF blocksJonathan Nieder1-5/+5
2013-10-10cherry-pick: handle "-" after parsing optionsJeff King2-2/+14
2013-10-10git-svn.txt: elaborate on rev_map filesKeshav Kini1-4/+24
2013-10-10git-svn.txt: replace .git with $GIT_DIRKeshav Kini1-8/+8
2013-10-10git-svn.txt: reword description of gc commandKeshav Kini1-2/+2
2013-10-10git-svn.txt: fix AsciiDoc formatting errorKeshav Kini1-1/+1
2013-10-10git-svn: fix signed commit parsingNicolas Vigier1-1/+1
2013-10-09checkout test: enable test with complex relative pathStefan Beller1-7/+7
2013-10-08Merge branch 'tz/credential-netrc'Jonathan Nieder1-1/+3
2013-10-08git-credential-netrc: fix uninitialized warningTed Zlatanov1-1/+3
2013-10-03Documentation/Makefile: make AsciiDoc dblatex dir configurableJohn Keeping1-1/+2
2013-09-30http: refactor options to http_get_*Jeff King4-28/+44
2013-09-30rebase -i: respect core.abbrevKirill A. Shutemov1-1/+1
2013-09-30http_request: factor out curlinfo_strbufJeff King1-7/+14
2013-09-30http_get_file: style fixesJeff King1-2/+2
2013-09-27RelNotes/1.8.5: direct script writers to "git status --porcelain"Matthieu Moy1-0/+3
2013-09-27remote set-head -h: add long options to synopsisPhilip Oakley1-2/+2
2013-09-27remote doc: document long forms of set-head optionsPhilip Oakley1-3/+3
2013-09-27clone: tighten "local paths with colons" check a bitNguyễn Thái Ngọc Duy2-2/+46
2013-09-26contrib: remove ciabotStefan Beller4-553/+0
2013-09-26Sync with Git 1.8.4.1Jonathan Nieder2-14/+36
2013-09-26Git 1.8.4.1v1.8.4.1Jonathan Nieder3-15/+37
2013-09-26merge-recursive: fix parsing of "diff-algorithm" optionJohn Keeping1-2/+2
2013-09-26Merge branch 'mm/rebase-continue-freebsd-WB' into maintJonathan Nieder1-1/+10
2013-09-26Merge branch 'km/svn-1.8-serf-only' into maintJonathan Nieder2-3/+34
2013-09-26Merge branch 'js/xread-in-full' into maintJonathan Nieder1-1/+1
2013-09-26Merge branch 'bc/send-email-ssl-die-message-fix' into maintJonathan Nieder1-1/+1
2013-09-24Merge branch 'bc/submodule-status-ignored'Jonathan Nieder7-11/+55
2013-09-24Merge branch 'cc/replace-with-the-same-type'Jonathan Nieder3-9/+61
2013-09-24Merge branch 'kb/msvc-compile'Jonathan Nieder7-23/+32
2013-09-24Merge branch 'nd/unpack-entry-optim-in-pack-objects'Jonathan Nieder1-10/+10
2013-09-24Merge branch 'jk/shortlog-tolerate-broken-commit'Jonathan Nieder2-2/+20
2013-09-24Merge branch 'jc/strcasecmp-pure-inline'Jonathan Nieder1-2/+16
2013-09-24Merge branch 'sg/complete-untracked-filter'Jonathan Nieder1-2/+2
2013-09-24Merge branch 'nd/fetch-pack-error-reporting-fix'Jonathan Nieder1-5/+5
2013-09-24Merge branch 'es/contacts-in-subdir'Jonathan Nieder1-0/+4
2013-09-24Merge branch 'jc/push-cas'Jonathan Nieder1-1/+1