summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | mergetool: style fixesJunio C Hamano2012-08-231-273/+308
* | | | | | | | | Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-113-2/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-243-2/+21
* | | | | | | | | | Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2012-09-112-0/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: invoke rerere in case of conflictPhil Hord2012-08-172-1/+2
| * | | | | | | | | | test: git-stash conflict sets up rererePhil Hord2012-08-171-0/+38
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11Junio C Hamano2012-09-111-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sane_execvp(): ignore non-directory on $PATHJunio C Hamano2012-07-311-0/+2
* | | | | | | | | | | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano2012-09-113-6/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: "git config baa" should exit with status 1Junio C Hamano2012-07-303-6/+11
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11Junio C Hamano2012-09-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-config doc: unconfuse an exampleJunio C Hamano2012-08-181-1/+1
| * | | | | | | | | | | git-config.txt: fix exampleMichael Haggerty2012-08-181-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Junio C Hamano2012-09-112-7/+52
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Let submodule command exit with error status if path does not existHeiko Voigt2012-08-142-7/+52
* | | | | | | | | | | | Merge branch 'mz/empty-rebase-test' into maint-1.7.11Junio C Hamano2012-09-111-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add tests for 'git rebase --keep-empty'Martin von Zweigbergk2012-08-091-1/+17
* | | | | | | | | | | | | Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11Junio C Hamano2012-09-112-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | docs: monospace listings in docbook outputJeff King2012-08-072-3/+3
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-112-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-052-0/+31
* | | | | | | | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Junio C Hamano2012-09-111-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD"Junio C Hamano2012-07-301-8/+8
* | | | | | | | | | | | | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-1113-32/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | diff_setup_done(): return voidThomas Rast2012-08-0313-32/+16
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'tr/merge-recursive-flush' into maint-1.7.11Junio C Hamano2012-09-111-18/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | merge-recursive: eliminate flush_buffer() in favor of write_in_full()Thomas Rast2012-08-031-18/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'nd/index-errno' into maint-1.7.11Junio C Hamano2012-09-111-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | read_index_from: remove bogus errno assignmentsNguyễn Thái Ngọc Duy2012-08-061-5/+1
* | | | | | | | | | | | | | | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-111-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | apply: delete unused deflate_origlen from patch structPaul Gortmaker2012-08-051-1/+0
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Almost 1.7.11.6Junio C Hamano2012-09-101-1/+29
* | | | | | | | | | | | | | | | Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11Junio C Hamano2012-09-101-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase -i: use full onto sha1 in reflogMichael J Gruber2012-08-101-2/+1
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11Junio C Hamano2012-09-101-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | sh-setup: protect from exported IFSJunio C Hamano2012-08-081-0/+4
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2012-09-102-1/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | receive-pack: do not leak output from auto-gc to standard outputJunio C Hamano2012-08-062-2/+3
| * | | | | | | | | | | | | | | | t/t5400: demonstrate breakage caused by informational message from pruneBrandon Casey2012-08-061-0/+35
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-1018-32/+188
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fsck: detect null sha1 in tree entriesJeff King2012-07-292-1/+33
| * | | | | | | | | | | | | | | | do not write null sha1s to on-disk indexJeff King2012-07-292-0/+21
| * | | | | | | | | | | | | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-2914-32/+135
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'tr/maint-send-email-2047' into maint-1.7.11Junio C Hamano2012-09-102-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | send-email: improve RFC2047 quote parsingThomas Rast2012-07-312-4/+19
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'mm/die-with-dashdash-help' into maint-1.7.11Junio C Hamano2012-09-101-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | setup: clarify error messages for file/revisions ambiguityMatthieu Moy2012-08-031-3/+5
* | | | | | | | | | | | | | | | | Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11Junio C Hamano2012-09-101-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFOJay Soffian2012-08-151-0/+5
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Prepare for 1.7.11.6Junio C Hamano2012-08-242-1/+35