Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'nd/maint-remote-remove' | Junio C Hamano | 2012-09-12 |
|\ | |||
| * | remote: prefer subcommand name 'remove' to 'rm' | Nguyễn Thái Ngọc Duy | 2012-09-06 |
* | | Merge branch 'nd/log-n-doc' | Junio C Hamano | 2012-09-12 |
|\ \ | |||
| * | | doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt | Nguyễn Thái Ngọc Duy | 2012-09-06 |
* | | | Merge branch 'kd/cvsimport-avoid-invalid-tag' | Junio C Hamano | 2012-09-12 |
|\ \ \ | |||
| * | | | cvsimport: strip all inappropriate tag strings | Ken Dreyer | 2012-09-06 |
* | | | | Merge branch 'js/compat-itimer' | Junio C Hamano | 2012-09-12 |
|\ \ \ \ | |||
| * | | | | Add a no-op setitimer() wrapper | Joachim Schmitz | 2012-09-08 |
* | | | | | Merge branch 'js/compat-mkdir' | Junio C Hamano | 2012-09-12 |
|\ \ \ \ \ | |||
| * | | | | | Document MKDIR_WO_TRAILING_SLASH in Makefile | Joachim Schmitz | 2012-09-08 |
* | | | | | | Merge git://ozlabs.org/~paulus/gitk | Junio C Hamano | 2012-09-12 |
|\ \ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'da/gitk-reload-tag-contents' of git://github.com/gitster/git | Paul Mackerras | 2012-09-12 |
| |\ \ \ \ \ \ | |||
| * | | | | | | | gitk: Fix GIT_TRACE issues | Aske Olsson | 2012-08-04 |
* | | | | | | | | Merge branch 'da/gitk-reload-tag-contents' | Junio C Hamano | 2012-09-12 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | gitk: Rename 'tagcontents' to 'cached_tagcontent' | David Aguilar | 2012-09-08 |
| * | | | | | | | gitk: Teach "Reread references" to reload tags | David Aguilar | 2012-09-08 |
| |/ / / / / / | |||
| * | | | | | | gitk: Avoid Meta1-F5 | Felipe Contreras | 2012-04-25 |
* | | | | | | | Second half of the fifth batch for 1.8.0 | Junio C Hamano | 2012-09-11 |
* | | | | | | | Merge branch 'rj/test-regex' | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | test-regex: Add a test to check for a bug in the regex routines | Ramsay Jones | 2012-09-02 |
* | | | | | | | | Merge branch 'jk/argv-array' | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | submodule: use argv_array instead of hand-building arrays | Jens Lehmann | 2012-09-02 |
| * | | | | | | | | fetch: use argv_array instead of hand-building arrays | Jeff King | 2012-09-02 |
| * | | | | | | | | argv-array: fix bogus cast when freeing array | Jeff King | 2012-09-02 |
| * | | | | | | | | argv-array: add pop function | Jeff King | 2012-09-02 |
* | | | | | | | | | Merge branch 'jc/merge-bases' | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | reduce_heads(): reimplement on top of remove_redundant() | Junio C Hamano | 2012-08-31 |
| * | | | | | | | | | merge-base: "--is-ancestor A B" | Junio C Hamano | 2012-08-31 |
| * | | | | | | | | | get_merge_bases_many(): walk from many tips in parallel | Junio C Hamano | 2012-08-30 |
| * | | | | | | | | | in_merge_bases(): use paint_down_to_common() | Junio C Hamano | 2012-08-30 |
| * | | | | | | | | | merge_bases_many(): split out the logic to paint history | Junio C Hamano | 2012-08-30 |
| * | | | | | | | | | in_merge_bases(): omit unnecessary redundant common ancestor reduction | Thomas Rast | 2012-08-28 |
| * | | | | | | | | | http-push: use in_merge_bases() for fast-forward check | Junio C Hamano | 2012-08-27 |
| * | | | | | | | | | receive-pack: use in_merge_bases() for fast-forward check | Junio C Hamano | 2012-08-27 |
| * | | | | | | | | | in_merge_bases(): support only one "other" commit | Junio C Hamano | 2012-08-27 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'nd/i18n-index-pack' | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | i18n: mark more index-pack strings for translation | Nguyễn Thái Ngọc Duy | 2012-08-31 |
* | | | | | | | | | | Merge branch 'jc/maint-ident-missing-human-name' | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | split_ident_line(): make best effort when parsing author/committer line | Junio C Hamano | 2012-08-31 |
* | | | | | | | | | | | Sync with maint | Junio C Hamano | 2012-09-11 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Further merging down for 1.7.12.1 | Junio C Hamano | 2012-09-11 |
| * | | | | | | | | | | | Sync with 1.7.11.6 | Junio C Hamano | 2012-09-11 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | Git 1.7.11.6v1.7.11.6 | Junio C Hamano | 2012-09-11 |
| | * | | | | | | | | | | | Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sz/submodule-force-update' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ph/stash-rerere' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-config-exit-status' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11 | Junio C Hamano | 2012-09-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |