Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -0/+2 |
|\ | |||||
| * | sane_execvp(): ignore non-directory on $PATH | Junio C Hamano | 2012-07-31 | 1 | -0/+2 |
* | | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 3 | -6/+11 |
|\ \ | |||||
| * | | config: "git config baa" should exit with status 1 | Junio C Hamano | 2012-07-30 | 3 | -6/+11 |
* | | | Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | git-config doc: unconfuse an example | Junio C Hamano | 2012-08-18 | 1 | -1/+1 |
| * | | | git-config.txt: fix example | Michael Haggerty | 2012-08-18 | 1 | -1/+1 |
* | | | | Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 2 | -7/+52 |
|\ \ \ \ | |||||
| * | | | | Let submodule command exit with error status if path does not exist | Heiko Voigt | 2012-08-14 | 2 | -7/+52 |
* | | | | | Merge branch 'mz/empty-rebase-test' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -1/+17 |
|\ \ \ \ \ | |||||
| * | | | | | add tests for 'git rebase --keep-empty' | Martin von Zweigbergk | 2012-08-09 | 1 | -1/+17 |
* | | | | | | Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 2 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | docs: monospace listings in docbook output | Jeff King | 2012-08-07 | 2 | -3/+3 |
* | | | | | | | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 2 | -0/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix '\ No newline...' annotation in rewrite diffs | Adam Butcher | 2012-08-05 | 2 | -0/+31 |
* | | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD" | Junio C Hamano | 2012-07-30 | 1 | -8/+8 |
* | | | | | | | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 13 | -32/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 13 | -32/+16 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'tr/merge-recursive-flush' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -18/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | merge-recursive: eliminate flush_buffer() in favor of write_in_full() | Thomas Rast | 2012-08-03 | 1 | -18/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'nd/index-errno' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | read_index_from: remove bogus errno assignments | Nguyễn Thái Ngọc Duy | 2012-08-06 | 1 | -5/+1 |
* | | | | | | | | | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | apply: delete unused deflate_origlen from patch struct | Paul Gortmaker | 2012-08-05 | 1 | -1/+0 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Almost 1.7.11.6 | Junio C Hamano | 2012-09-10 | 1 | -1/+29 |
* | | | | | | | | | | Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rebase -i: use full onto sha1 in reflog | Michael J Gruber | 2012-08-10 | 1 | -2/+1 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | sh-setup: protect from exported IFS | Junio C Hamano | 2012-08-08 | 1 | -0/+4 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 2 | -1/+37 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | receive-pack: do not leak output from auto-gc to standard output | Junio C Hamano | 2012-08-06 | 2 | -2/+3 |
| * | | | | | | | | | | t/t5400: demonstrate breakage caused by informational message from prune | Brandon Casey | 2012-08-06 | 1 | -0/+35 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 18 | -32/+188 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fsck: detect null sha1 in tree entries | Jeff King | 2012-07-29 | 2 | -1/+33 |
| * | | | | | | | | | | do not write null sha1s to on-disk index | Jeff King | 2012-07-29 | 2 | -0/+21 |
| * | | | | | | | | | | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 | 14 | -32/+135 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'tr/maint-send-email-2047' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 2 | -4/+19 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | send-email: improve RFC2047 quote parsing | Thomas Rast | 2012-07-31 | 2 | -4/+19 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | setup: clarify error messages for file/revisions ambiguity | Matthieu Moy | 2012-08-03 | 1 | -3/+5 |
* | | | | | | | | | | | Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO | Jay Soffian | 2012-08-15 | 1 | -0/+5 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Prepare for 1.7.11.6 | Junio C Hamano | 2012-08-24 | 2 | -1/+35 |
* | | | | | | | | | | | Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | man: git pull -r is a short for --rebase | Miklos Vajna | 2012-08-17 | 1 | -0/+1 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | gitcli: describe abbreviation of long options | Junio C Hamano | 2012-08-16 | 1 | -0/+8 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11 | Junio C Hamano | 2012-08-24 | 1 | -7/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | rev-list docs: clarify --topo-order description | Junio C Hamano | 2012-08-15 | 1 | -7/+24 |
| | |_|/ / / / / / / / | |/| | | | | | | | | |