Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | Merge branch 'jc/hide-cr-in-diff-from-less' | Junio C Hamano | 2008-09-07 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||
| * | | | | | | | | | | diff: Help "less" hide ^M from the output | Junio C Hamano | 2008-08-30 | |
* | | | | | | | | | | | Merge branch 'jc/maint-checkout-fix' | Junio C Hamano | 2008-09-07 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||
| * | | | | | | | | | checkout: do not check out unmerged higher stages randomly | Junio C Hamano | 2008-08-30 | |
* | | | | | | | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2008-09-06 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||
| * | | | | | | | | | git-svn: set auto_props when renaming files | Paul Talacko | 2008-09-06 | |
| * | | | | | | | | | t9124: clean up chdir usage | Eric Wong | 2008-09-06 | |
| * | | | | | | | | | git-svn: fix 'info' tests for unknown items | Thomas Rast | 2008-09-05 | |
| * | | | | | | | | | git svn info: always quote URLs in 'info' output | Thomas Rast | 2008-09-05 | |
| * | | | | | | | | | git svn info: make info relative to the current directory | Thomas Rast | 2008-09-05 | |
| * | | | | | | | | | git svn info: tests: fix ptouch argument order in setup | Thomas Rast | 2008-09-05 | |
| * | | | | | | | | | git svn info: tests: use test_cmp instead of git-diff | Thomas Rast | 2008-09-05 | |
| * | | | | | | | | | git svn info: tests: do not use set -e | Thomas Rast | 2008-09-05 | |
| * | | | | | | | | | git svn info: tests: let 'init' test run with SVN 1.5 | Thomas Rast | 2008-09-05 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-06 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | ||||
| * | | | | | | | "blame -c" should be compatible with "annotate" | Junio C Hamano | 2008-09-05 | |
* | | | | | | | | Merge branch 'jc/maint-log-grep' | Junio C Hamano | 2008-09-04 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||
| * | | | | | | | log --author/--committer: really match only with name part | Junio C Hamano | 2008-09-04 | |
| |/ / / / / / | ||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-03 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||
| * | | | | | | Merge branch 'nd/worktree' into maint | Junio C Hamano | 2008-09-03 | |
| |\ \ \ \ \ \ | ||||
| | * | | | | | | grep: fix worktree setup | Nguyễn Thái Ngọc Duy | 2008-08-28 | |
| | * | | | | | | diff*: fix worktree setup | Nguyễn Thái Ngọc Duy | 2008-08-28 | |
| * | | | | | | | Merge branch 'ho/dashless' into maint | Junio C Hamano | 2008-09-03 | |
| |\ \ \ \ \ \ \ | ||||
| | * | | | | | | | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 | |
| | * | | | | | | | tests: use "git xyzzy" form (t7000 - t7199) | Nanako Shiraishi | 2008-09-03 | |
| | * | | | | | | | tests: use "git xyzzy" form (t3600 - t6999) | Nanako Shiraishi | 2008-09-03 | |
| | * | | | | | | | tests: use "git xyzzy" form (t0000 - t3599) | Nanako Shiraishi | 2008-09-03 | |
| | | |/ / / / / | | |/| | | | | | ||||
| * | | | | | | | clone: fix creation of explicitly named target directory | Clemens Buchacher | 2008-09-03 | |
* | | | | | | | | Merge branch 'tr/filter-branch' | Junio C Hamano | 2008-09-02 | |
|\ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/post-simplify' into tr/filter-branch | Junio C Hamano | 2008-08-12 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||
| | * | | | | | | | Topo-sort before --simplify-merges | Junio C Hamano | 2008-08-03 | |
| * | | | | | | | | filter-branch: fix ref rewriting with --subdirectory-filter | Thomas Rast | 2008-08-12 | |
| * | | | | | | | | filter-branch: Extend test to show rewriting bug | Thomas Rast | 2008-08-12 | |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-02 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | ||||
| * | | | | | | | Bring local clone's origin URL in line with that of a remote clone | Johan Herland | 2008-09-01 | |
| | |_|_|_|/ / | |/| | | | | | ||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-08-30 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||
| * | | | | | | git-apply: Loosen "match_beginning" logic | Junio C Hamano | 2008-08-30 | |
| * | | | | | | Merge branch 'sp/missing-thin-base' into maint | Junio C Hamano | 2008-08-30 | |
| |\ \ \ \ \ \ | ||||
| | * | | | | | | pack-objects: Allow missing base objects when creating thin packs | Shawn O. Pearce | 2008-08-12 | |
| | |/ / / / / | ||||
| * | | | | | | Merge branch 'np/verify-pack' into maint | Junio C Hamano | 2008-08-29 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-08-29 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | ||||
| * | | | | | pretty=format: respect date format options | Jeff King | 2008-08-29 | |
| | |_|_|/ | |/| | | | ||||
* | | | | | Merge branch 'mv/merge-custom' | Junio C Hamano | 2008-08-27 | |
|\ \ \ \ \ | ||||
| * | | | | | t7606: fix custom merge test | Junio C Hamano | 2008-08-23 | |
| * | | | | | Add a second testcase for handling invalid strategies in git-merge | Miklos Vajna | 2008-07-29 | |
| * | | | | | Add a new test for using a custom merge strategy | Miklos Vajna | 2008-07-29 | |
* | | | | | | Merge branch 'am/cherry-pick-rerere' | Junio C Hamano | 2008-08-27 | |
|\ \ \ \ \ \ | ||||
| * | | | | | | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | 2008-08-11 | |
* | | | | | | | Merge branch 'np/verify-pack' | Junio C Hamano | 2008-08-27 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||
| * | | | | | | discard revindex data when pack list changes | Nicolas Pitre | 2008-08-22 |