summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/merge-bases'Junio C Hamano2012-09-1111-112/+184
|\
| * reduce_heads(): reimplement on top of remove_redundant()Junio C Hamano2012-08-311-38/+18
| * merge-base: "--is-ancestor A B"Junio C Hamano2012-08-312-0/+50
| * get_merge_bases_many(): walk from many tips in parallelJunio C Hamano2012-08-301-21/+58
| * in_merge_bases(): use paint_down_to_common()Junio C Hamano2012-08-301-10/+7
| * merge_bases_many(): split out the logic to paint historyJunio C Hamano2012-08-301-19/+28
| * in_merge_bases(): omit unnecessary redundant common ancestor reductionThomas Rast2012-08-281-1/+4
| * http-push: use in_merge_bases() for fast-forward checkJunio C Hamano2012-08-271-2/+1
| * receive-pack: use in_merge_bases() for fast-forward checkJunio C Hamano2012-08-271-7/+1
| * in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-277-18/+21
* | Merge branch 'nd/i18n-index-pack'Junio C Hamano2012-09-111-10/+11
|\ \
| * | i18n: mark more index-pack strings for translationNguyễn Thái Ngọc Duy2012-08-311-10/+11
* | | Merge branch 'jc/maint-ident-missing-human-name'Junio C Hamano2012-09-112-3/+20
|\ \ \
| * | | split_ident_line(): make best effort when parsing author/committer lineJunio C Hamano2012-08-312-3/+20
* | | | Sync with maintJunio C Hamano2012-09-113-34/+70
|\ \ \ \
| * | | | Further merging down for 1.7.12.1Junio C Hamano2012-09-111-0/+13
| * | | | Sync with 1.7.11.6Junio C Hamano2012-09-1132-392/+569
| |\ \ \ \
| | * | | | Git 1.7.11.6v1.7.11.6Junio C Hamano2012-09-113-35/+58
| | * | | | Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11Junio C Hamano2012-09-111-273/+308
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-113-2/+21
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2012-09-112-0/+39
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11Junio C Hamano2012-09-111-0/+2
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano2012-09-113-6/+11
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11Junio C Hamano2012-09-111-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Junio C Hamano2012-09-112-7/+52
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/empty-rebase-test' into maint-1.7.11Junio C Hamano2012-09-111-1/+17
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11Junio C Hamano2012-09-112-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-112-0/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Junio C Hamano2012-09-111-8/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-1113-32/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/merge-recursive-flush' into maint-1.7.11Junio C Hamano2012-09-111-18/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-errno' into maint-1.7.11Junio C Hamano2012-09-111-5/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-111-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/use-sc-open-max' into maintJunio C Hamano2012-09-111-7/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/no-curl-easy-strerror-on-old-curl' into maintJunio C Hamano2012-09-111-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/precompose-utf8-cleanup' into maintJunio C Hamano2012-09-111-25/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/capabilities' into maintJunio C Hamano2012-09-118-17/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/doc-git-updates' into maintJunio C Hamano2012-09-111-28/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/check-docs-update' into maintJunio C Hamano2012-09-116-29/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/test-prereq' into maintJunio C Hamano2012-09-116-205/+233
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | First half of the fifth batch for 1.8.0Junio C Hamano2012-09-101-0/+24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/branch-set-upstream-to'Junio C Hamano2012-09-103-4/+140
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: deprecate --set-upstream and show help if we detect possible mistaken...Carlos Martín Nieto2012-08-302-0/+60
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: add --unset-upstream optionCarlos Martín Nieto2012-08-303-3/+45
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: introduce --set-upstream-toCarlos Martín Nieto2012-08-233-3/+37
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mz/cherry-pick-cmdline-order'Junio C Hamano2012-09-108-11/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-pick/revert: respect order of revisions to pickMartin von Zweigbergk2012-08-303-3/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | demonstrate broken 'git cherry-pick three one two'Martin von Zweigbergk2012-08-301-0/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | teach log --no-walk=unsorted, which avoids sortingMartin von Zweigbergk2012-08-306-9/+40
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log'Junio C Hamano2012-09-102-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status