aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2012-09-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/gitk-reload-tag-contents' of git://github.com/gitster/gitPaul Mackerras2012-09-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | gitk: Fix GIT_TRACE issuesAske Olsson2012-08-04
* | | | | | | | | | | | | | | | | | Merge branch 'da/gitk-reload-tag-contents'Junio C Hamano2012-09-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | gitk: Rename 'tagcontents' to 'cached_tagcontent'David Aguilar2012-09-08
| * | | | | | | | | | | | | | | | | gitk: Teach "Reread references" to reload tagsDavid Aguilar2012-09-08
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | gitk: Avoid Meta1-F5Felipe Contreras2012-04-25
* | | | | | | | | | | | | | | | | Second half of the fifth batch for 1.8.0Junio C Hamano2012-09-11
* | | | | | | | | | | | | | | | | Merge branch 'rj/test-regex'Junio C Hamano2012-09-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | test-regex: Add a test to check for a bug in the regex routinesRamsay Jones2012-09-02
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/argv-array'Junio C Hamano2012-09-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | submodule: use argv_array instead of hand-building arraysJens Lehmann2012-09-02
| * | | | | | | | | | | | | | | | | fetch: use argv_array instead of hand-building arraysJeff King2012-09-02
| * | | | | | | | | | | | | | | | | argv-array: fix bogus cast when freeing arrayJeff King2012-09-02
| * | | | | | | | | | | | | | | | | argv-array: add pop functionJeff King2012-09-02
* | | | | | | | | | | | | | | | | | Merge branch 'jc/merge-bases'Junio C Hamano2012-09-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | reduce_heads(): reimplement on top of remove_redundant()Junio C Hamano2012-08-31
| * | | | | | | | | | | | | | | | | | merge-base: "--is-ancestor A B"Junio C Hamano2012-08-31
| * | | | | | | | | | | | | | | | | | get_merge_bases_many(): walk from many tips in parallelJunio C Hamano2012-08-30
| * | | | | | | | | | | | | | | | | | in_merge_bases(): use paint_down_to_common()Junio C Hamano2012-08-30
| * | | | | | | | | | | | | | | | | | merge_bases_many(): split out the logic to paint historyJunio C Hamano2012-08-30
| * | | | | | | | | | | | | | | | | | in_merge_bases(): omit unnecessary redundant common ancestor reductionThomas Rast2012-08-28
| * | | | | | | | | | | | | | | | | | http-push: use in_merge_bases() for fast-forward checkJunio C Hamano2012-08-27
| * | | | | | | | | | | | | | | | | | receive-pack: use in_merge_bases() for fast-forward checkJunio C Hamano2012-08-27
| * | | | | | | | | | | | | | | | | | in_merge_bases(): support only one "other" commitJunio C Hamano2012-08-27
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/i18n-index-pack'Junio C Hamano2012-09-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | i18n: mark more index-pack strings for translationNguyễn Thái Ngọc Duy2012-08-31
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-ident-missing-human-name'Junio C Hamano2012-09-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | split_ident_line(): make best effort when parsing author/committer lineJunio C Hamano2012-08-31
* | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2012-09-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Further merging down for 1.7.12.1Junio C Hamano2012-09-11
| * | | | | | | | | | | | | | | | | | Sync with 1.7.11.6Junio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Git 1.7.11.6v1.7.11.6Junio C Hamano2012-09-11
| | * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-config-exit-status' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/empty-rebase-test' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/merge-recursive-flush' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-errno' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/use-sc-open-max' into maintJunio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/no-curl-easy-strerror-on-old-curl' into maintJunio C Hamano2012-09-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \