Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sg/completion-updates' | Junio C Hamano | 2011-05-16 | 1 | -4/+16 |
|\ | |||||
| * | Merge branch 'fc/completion-zsh' into sg/completion-updates | Junio C Hamano | 2011-05-10 | 1 | -0/+8 |
| |\ | |||||
| | * | git-completion: fix regression in zsh support | Felipe Contreras | 2011-05-10 | 1 | -0/+8 |
| * | | Revert "completion: don't declare 'local words' to make zsh happy" | Junio C Hamano | 2011-05-10 | 1 | -6/+2 |
| * | | completion: move private shopt shim for zsh to __git_ namespace | Jonathan Nieder | 2011-05-08 | 1 | -4/+8 |
| * | | completion: don't declare 'local words' to make zsh happy | SZEDER Gábor | 2011-04-28 | 1 | -2/+6 |
* | | | Merge branch 'kk/maint-prefix-in-config-mak' | Junio C Hamano | 2011-05-16 | 1 | -9/+9 |
|\ \ \ | |||||
| * | | | Honor $(prefix) set in config.mak* when defining ETC_GIT* | Johannes Sixt | 2011-05-09 | 1 | -9/+9 |
| * | | | Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf... | Junio C Hamano | 2011-05-09 | 1 | -10/+9 |
| * | | | Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir | Kacper Kornet | 2011-04-28 | 1 | -9/+10 |
* | | | | Merge branch 'mg/merge-ff-config' | Junio C Hamano | 2011-05-16 | 3 | -6/+77 |
|\ \ \ \ | |||||
| * | | | | tests: check git does not barf on merge.ff values for future versions of git | Jonathan Nieder | 2011-05-06 | 1 | -2/+14 |
| * | | | | merge: introduce merge.ff configuration variable | Junio C Hamano | 2011-05-06 | 3 | -2/+60 |
| * | | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config | Junio C Hamano | 2011-05-06 | 2 | -15/+59 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-16 | 2 | -2/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Update draft release notes to 1.7.5.2 | Junio C Hamano | 2011-05-16 | 1 | -0/+15 |
| * | | | | | Merge branch 'jn/maint-format-patch-doc' into maint | Junio C Hamano | 2011-05-16 | 1 | -0/+58 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ss/cherry-pick-x-doc' into maint | Junio C Hamano | 2011-05-16 | 1 | -3/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'vr/merge-base-doc' into maint | Junio C Hamano | 2011-05-16 | 2 | -14/+23 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maint | Junio C Hamano | 2011-05-16 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint | Junio C Hamano | 2011-05-16 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/fix-add-u-unmerged' into maint | Junio C Hamano | 2011-05-16 | 2 | -39/+30 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/gitweb-dependency' into maint | Junio C Hamano | 2011-05-16 | 1 | -27/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-branch-mergeoptions' into maint | Junio C Hamano | 2011-05-16 | 2 | -15/+58 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maint | Junio C Hamano | 2011-05-16 | 3 | -16/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Documentation/git-fsck.txt: fix typo: unreadable -> unreachable | Jim Meyering | 2011-05-16 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Sync release notes for 1.7.6 to exclude what are in maintenance track | Junio C Hamano | 2011-05-15 | 1 | -12/+0 |
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-15 | 2 | -9/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Update draft release notes to 1.7.5.2 | Junio C Hamano | 2011-05-15 | 1 | -0/+9 |
| * | | | | | | | | | | | | | Merge branch 'cn/format-patch-quiet' into maint | Junio C Hamano | 2011-05-15 | 2 | -7/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/mergetool-submodules' into maint | Junio C Hamano | 2011-05-15 | 2 | -9/+371 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/format-patch-quote-special-in-from' into maint | Junio C Hamano | 2011-05-15 | 2 | -1/+102 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vh/git-svn-doc' into maint | Junio C Hamano | 2011-05-15 | 1 | -11/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | git_open_noatime(): drop unused parameter | Junio C Hamano | 2011-05-15 | 1 | -8/+7 |
| * | | | | | | | | | | | | | | | | | sha1_file: typofix | Junio C Hamano | 2011-05-15 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-14 | 3 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable names | Jonathan Nieder | 2011-05-14 | 3 | -6/+6 |
* | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.6 | Junio C Hamano | 2011-05-13 | 1 | -30/+16 |
* | | | | | | | | | | | | | | | | | | Merge branch 'bf/commit-template-no-cleanup' | Junio C Hamano | 2011-05-13 | 3 | -1/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Do not strip empty lines / trailing spaces from a commit message template | Boris Faure | 2011-05-11 | 3 | -1/+25 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha' | Junio C Hamano | 2011-05-13 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | t1507: avoid "${parameter<op>'word'}" inside double-quotes | Junio C Hamano | 2011-05-09 | 1 | -2/+5 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rr/rerere-libify-clear-gc' | Junio C Hamano | 2011-05-13 | 3 | -75/+88 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | rerere: libify rerere_clear() and rerere_gc() | Junio C Hamano | 2011-05-08 | 3 | -75/+88 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' | Junio C Hamano | 2011-05-13 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... | Junio C Hamano | 2011-05-05 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | send-pack: unbreak push over stateless rpc | Jeff King | 2011-05-05 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... | Junio C Hamano | 2011-04-25 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | send-pack: avoid deadlock when pack-object dies early | Johannes Sixt | 2011-04-25 | 1 | -0/+4 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/dirstat-lines' | Junio C Hamano | 2011-05-13 | 5 | -32/+1219 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |