summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/completion-updates'Junio C Hamano2011-05-161-4/+16
|\
| * Merge branch 'fc/completion-zsh' into sg/completion-updatesJunio C Hamano2011-05-101-0/+8
| |\
| | * git-completion: fix regression in zsh supportFelipe Contreras2011-05-101-0/+8
| * | Revert "completion: don't declare 'local words' to make zsh happy"Junio C Hamano2011-05-101-6/+2
| * | completion: move private shopt shim for zsh to __git_ namespaceJonathan Nieder2011-05-081-4/+8
| * | completion: don't declare 'local words' to make zsh happySZEDER Gábor2011-04-281-2/+6
* | | Merge branch 'kk/maint-prefix-in-config-mak'Junio C Hamano2011-05-161-9/+9
|\ \ \
| * | | Honor $(prefix) set in config.mak* when defining ETC_GIT*Johannes Sixt2011-05-091-9/+9
| * | | Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...Junio C Hamano2011-05-091-10/+9
| * | | Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdirKacper Kornet2011-04-281-9/+10
* | | | Merge branch 'mg/merge-ff-config'Junio C Hamano2011-05-163-6/+77
|\ \ \ \
| * | | | tests: check git does not barf on merge.ff values for future versions of gitJonathan Nieder2011-05-061-2/+14
| * | | | merge: introduce merge.ff configuration variableJunio C Hamano2011-05-063-2/+60
| * | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configJunio C Hamano2011-05-062-15/+59
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge branch 'maint'Junio C Hamano2011-05-162-2/+17
|\ \ \ \ \
| * | | | | Update draft release notes to 1.7.5.2Junio C Hamano2011-05-161-0/+15
| * | | | | Merge branch 'jn/maint-format-patch-doc' into maintJunio C Hamano2011-05-161-0/+58
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ss/cherry-pick-x-doc' into maintJunio C Hamano2011-05-161-3/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'vr/merge-base-doc' into maintJunio C Hamano2011-05-162-14/+23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maintJunio C Hamano2011-05-161-3/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintJunio C Hamano2011-05-161-2/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-162-39/+30
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/gitweb-dependency' into maintJunio C Hamano2011-05-161-27/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-162-15/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-163-16/+54
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/git-fsck.txt: fix typo: unreadable -> unreachableJim Meyering2011-05-161-2/+2
* | | | | | | | | | | | | | Sync release notes for 1.7.6 to exclude what are in maintenance trackJunio C Hamano2011-05-151-12/+0
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-152-9/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Update draft release notes to 1.7.5.2Junio C Hamano2011-05-151-0/+9
| * | | | | | | | | | | | | Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2011-05-152-7/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2011-05-152-9/+371
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2011-05-152-1/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vh/git-svn-doc' into maintJunio C Hamano2011-05-151-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git_open_noatime(): drop unused parameterJunio C Hamano2011-05-151-8/+7
| * | | | | | | | | | | | | | | | | sha1_file: typofixJunio C Hamano2011-05-151-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-143-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-143-6/+6
* | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-131-30/+16
* | | | | | | | | | | | | | | | | | Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-133-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-113-1/+25
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha'Junio C Hamano2011-05-131-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-091-2/+5
* | | | | | | | | | | | | | | | | | | Merge branch 'rr/rerere-libify-clear-gc'Junio C Hamano2011-05-133-75/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-083-75/+88
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-131-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | send-pack: unbreak push over stateless rpcJeff King2011-05-051-1/+2
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-04-251-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | send-pack: avoid deadlock when pack-object dies earlyJohannes Sixt2011-04-251-0/+4
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-135-32/+1219
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \