aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | Merge branch 'fc/completion-zsh' into sg/completion-updatesJunio C Hamano2011-05-10
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | git-completion: fix regression in zsh supportFelipe Contreras2011-05-10
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Revert "completion: don't declare 'local words' to make zsh happy"Junio C Hamano2011-05-10
| * | | | | | | | | | | completion: move private shopt shim for zsh to __git_ namespaceJonathan Nieder2011-05-08
| * | | | | | | | | | | completion: don't declare 'local words' to make zsh happySZEDER Gábor2011-04-28
* | | | | | | | | | | | Merge branch 'kk/maint-prefix-in-config-mak'Junio C Hamano2011-05-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT*Johannes Sixt2011-05-09
| * | | | | | | | | | | | Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...Junio C Hamano2011-05-09
| * | | | | | | | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdirKacper Kornet2011-04-28
* | | | | | | | | | | | | Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tests: check git does not barf on merge.ff values for future versions of gitJonathan Nieder2011-05-06
| * | | | | | | | | | | | | merge: introduce merge.ff configuration variableJunio C Hamano2011-05-06
| * | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Update draft release notes to 1.7.5.2Junio C Hamano2011-05-16
| * | | | | | | | | | | | | Merge branch 'jn/maint-format-patch-doc' into maintJunio C Hamano2011-05-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/cherry-pick-x-doc' into maintJunio C Hamano2011-05-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vr/merge-base-doc' into maintJunio C Hamano2011-05-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maintJunio C Hamano2011-05-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintJunio C Hamano2011-05-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/gitweb-dependency' into maintJunio C Hamano2011-05-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Documentation/git-fsck.txt: fix typo: unreadable -> unreachableJim Meyering2011-05-16
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Sync release notes for 1.7.6 to exclude what are in maintenance trackJunio C Hamano2011-05-15
* | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.5.2Junio C Hamano2011-05-15
| * | | | | | | | | | | | | | | | | | | | Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2011-05-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2011-05-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2011-05-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vh/git-svn-doc' into maintJunio C Hamano2011-05-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | git_open_noatime(): drop unused parameterJunio C Hamano2011-05-15
| * | | | | | | | | | | | | | | | | | | | | | | | sha1_file: typofixJunio C Hamano2011-05-15
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-14
* | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-13
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-09
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/rerere-libify-clear-gc'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-08
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | send-pack: unbreak push over stateless rpcJeff King2011-05-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-04-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | send-pack: avoid deadlock when pack-object dies earlyJohannes Sixt2011-04-25
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Mark dirstat error messages for translationJohan Herland2011-04-29