Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Start preparing for 1.8.4.1 | Junio C Hamano | 2013-09-18 | 2 | -1/+51 |
* | Merge branch 'bc/completion-for-bash-3.0' into maint | Junio C Hamano | 2013-09-18 | 3 | -3/+7 |
|\ | |||||
| * | contrib/git-prompt.sh: handle missing 'printf -v' more gracefullybc/completion-for-bash-3.0 | Brandon Casey | 2013-08-22 | 1 | -1/+5 |
| * | t9902-completion.sh: old Bash still does not support array+=('') notation | Brandon Casey | 2013-08-21 | 1 | -1/+1 |
| * | git-completion.bash: use correct Bash/Zsh array length syntax | Brandon Casey | 2013-08-21 | 1 | -1/+1 |
* | | Merge branch 'mm/no-shell-escape-in-die-message' into maint | Junio C Hamano | 2013-09-18 | 2 | -1/+14 |
|\ \ | |||||
| * | | die_with_status: use "printf '%s\n'", not "echo"mm/no-shell-escape-in-die-message | Matthieu Moy | 2013-08-07 | 2 | -1/+14 |
* | | | Merge branch 'jl/some-submodule-config-are-not-boolean' into maint | Junio C Hamano | 2013-09-18 | 2 | -0/+16 |
|\ \ \ | |||||
| * | | | avoid segfault on submodule.*.path set to an empty "true"jl/some-submodule-config-are-not-boolean | Jharrod LaFon | 2013-08-19 | 2 | -0/+16 |
* | | | | Merge branch 'tr/log-full-diff-keep-true-parents' into maint | Junio C Hamano | 2013-09-18 | 8 | -3/+134 |
|\ \ \ \ | |||||
| * | | | | log: use true parents for diff when walking reflogstr/log-full-diff-keep-true-parents | Thomas Rast | 2013-08-05 | 2 | -3/+47 |
| * | | | | log: use true parents for diff even when rewriting | Thomas Rast | 2013-08-01 | 7 | -3/+90 |
* | | | | | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maint | Junio C Hamano | 2013-09-18 | 4 | -31/+134 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/fetch.c: Fix a sparse warningjc/transport-do-not-use-connect-twice-in-fetch | Ramsay Jones | 2013-08-28 | 1 | -1/+1 |
| * | | | | | fetch: work around "transport-take-over" hack | Junio C Hamano | 2013-08-07 | 3 | -0/+21 |
| * | | | | | fetch: refactor code that fetches leftover tags | Junio C Hamano | 2013-08-07 | 1 | -5/+9 |
| * | | | | | fetch: refactor code that prepares a transport | Junio C Hamano | 2013-08-07 | 1 | -20/+26 |
| * | | | | | fetch: rename file-scope global "transport" to "gtransport" | Junio C Hamano | 2013-08-07 | 1 | -11/+11 |
| * | | | | | t5802: add test for connect helper | Junio C Hamano | 2013-08-07 | 1 | -0/+72 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'sp/clip-read-write-to-8mb' into maint | Junio C Hamano | 2013-09-18 | 6 | -27/+26 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"sp/clip-read-write-to-8mb | Steffen Prohaska | 2013-08-20 | 4 | -27/+0 |
| * | | | | | xread, xwrite: limit size of IO to 8MB | Steffen Prohaska | 2013-08-20 | 2 | -0/+26 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jk/mailmap-incomplete-line' into maint | Junio C Hamano | 2013-09-18 | 2 | -13/+24 |
|\ \ \ \ \ | |||||
| * | | | | | mailmap: handle mailmap blobs without trailing newlinesjk/mailmap-incomplete-line | Jeff King | 2013-08-28 | 2 | -13/+24 |
* | | | | | | t7406-submodule-update: add missing && | Tay Ray Chuan | 2013-09-17 | 1 | -1/+1 |
* | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2013-09-11 | 1 | -11/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | l10n: de.po: use "das Tag" instead of "der Tag" | Ralf Thielow | 2013-09-08 | 1 | -11/+11 |
* | | | | | | | Merge branch 'nd/fetch-pack-shallow-fix' into maint | Junio C Hamano | 2013-09-05 | 2 | -1/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fetch-pack: do not remove .git/shallow file when --depth is not specifiednd/fetch-pack-shallow-fix | Nguyễn Thái Ngọc Duy | 2013-08-25 | 2 | -1/+19 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'hv/config-from-blob' into maint | Junio C Hamano | 2013-09-05 | 1 | -16/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | config: do not use C function names as struct membershv/config-from-blob | Jeff King | 2013-08-26 | 1 | -16/+16 |
* | | | | | | | | Merge branch 'maint-1.8.3' into maint | Junio C Hamano | 2013-09-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.8.2' into maint-1.8.3maint-1.8.3 | Junio C Hamano | 2013-09-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Documentation/git-merge.txt: fix formatting of example blockmaint-1.8.2 | Andreas Schwab | 2013-09-05 | 1 | -2/+2 |
* | | | | | | | | | | Merge git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2013-09-03 | 2 | -718/+874 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | l10n: fr.po: hotfix for commit 6b388fc | Sebastien Helleu | 2013-08-30 | 2 | -718/+874 |
* | | | | | | | | | | Merge branch 'maint-1.8.3' into maint | Junio C Hamano | 2013-09-03 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'maint-1.8.2' into maint-1.8.3 | Junio C Hamano | 2013-09-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | fix shell syntax error in template | Thorsten Glaser | 2013-08-30 | 1 | -0/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Git 1.8.4v1.8.4 | Junio C Hamano | 2013-08-23 | 2 | -1/+6 |
* | | | | | | | Typofix draft release notes to 1.8.4 | Junio C Hamano | 2013-08-21 | 1 | -2/+2 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Git 1.8.4-rc4v1.8.4-rc4 | Junio C Hamano | 2013-08-19 | 2 | -10/+1 |
* | | | | | | Revert "Add new @ shortcut for HEAD" | Junio C Hamano | 2013-08-14 | 5 | -28/+0 |
* | | | | | | Revert "git stash: avoid data loss when "git stash save" kills a directory" | Junio C Hamano | 2013-08-14 | 3 | -40/+2 |
* | | | | | | Git 1.8.4-rc3v1.8.4-rc3 | Junio C Hamano | 2013-08-13 | 1 | -1/+1 |
* | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2013-08-13 | 2 | -0/+9672 |
|\ \ \ \ \ \ | |||||
| * | | | | | | l10n: Add reference for french translation team | Jean-Noel Avila | 2013-08-11 | 1 | -0/+4 |
| * | | | | | | l10n: fr.po: 821/2112 messages translated | Jean-Noel Avila | 2013-08-11 | 1 | -0/+9668 |
* | | | | | | | Merge branch 'sb/mailmap-updates' | Junio C Hamano | 2013-08-13 | 1 | -2/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | .mailmap: Combine more (name, email) to individual personssb/mailmap-updates | Stefan Beller | 2013-08-13 | 1 | -1/+3 |