Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-26 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | Remove empty directories in recursive merge | Alex Riesen | 2008-09-26 | 1 | -0/+11 | |
* | | | | | | | Merge branch 'mv/merge-recursive' | Shawn O. Pearce | 2008-09-25 | 1 | -0/+22 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | builtin-merge: release the lockfile in try_merge_strategy() | Miklos Vajna | 2008-09-06 | 1 | -0/+22 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge branch 'am/status' | Shawn O. Pearce | 2008-09-25 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | wt-status: Teach how to discard changes in the working directory | Anders Melchiorsen | 2008-09-07 | 1 | -0/+10 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'mv/commit-tree' | Shawn O. Pearce | 2008-09-25 | 1 | -0/+53 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | t7603: add new testcases to ensure builtin-commit uses reduce_heads() | Miklos Vajna | 2008-09-10 | 1 | -0/+53 | |
* | | | | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-25 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | maint: check return of split_cmdline to avoid bad config strings | Deskin Miller | 2008-09-24 | 1 | -0/+10 | |
* | | | | | | | | git-svn: do a partial rebuild if rev_map is out-of-date | Deskin Miller | 2008-09-21 | 1 | -1/+1 | |
* | | | | | | | | git-svn: testcase for partial rebuild | Deskin Miler | 2008-09-21 | 1 | -0/+59 | |
* | | | | | | | | Merge branch 'db/maint-checkout-b' | Junio C Hamano | 2008-09-21 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Check early that a new branch is new and valid | Daniel Barkalow | 2008-09-21 | 1 | -0/+10 | |
| |/ / / / / / / | ||||||
* | | | | | | | | t5510: test "git fetch" following tags minimally | Junio C Hamano | 2008-09-21 | 1 | -0/+20 | |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-18 | 5 | -13/+287 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Make git archive respect core.autocrlf when creating zip format archives | Charles Bailey | 2008-09-18 | 1 | -1/+1 | |
| * | | | | | | | Add new test to demonstrate git archive core.autocrlf inconsistency | Charles Bailey | 2008-09-18 | 1 | -0/+46 | |
| * | | | | | | | git-svn: fix handling of even funkier branch names | Eric Wong | 2008-09-18 | 1 | -0/+16 | |
| * | | | | | | | git-svn: Always create a new RA when calling do_switch for svn:// | Alec Berryman | 2008-09-18 | 2 | -0/+223 | |
| * | | | | | | | git-svn: factor out svnserve test code for later use | Alec Berryman | 2008-09-18 | 2 | -13/+18 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge branch 'np/pack' | Junio C Hamano | 2008-09-18 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | t5300: improve SHA1 collision test | Nicolas Pitre | 2008-09-02 | 1 | -1/+2 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'bw/shortref' | Junio C Hamano | 2008-09-18 | 1 | -0/+44 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | for-each-ref: `:short` format for `refname` | Bert Wesarg | 2008-09-05 | 1 | -0/+44 | |
* | | | | | | | | Merge branch 'tr/rev-list-reverse' | Junio C Hamano | 2008-09-18 | 1 | -0/+42 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | t6013: replace use of 'tac' with equivalent Perl | Thomas Rast | 2008-08-31 | 1 | -2/+2 | |
| * | | | | | | | | rev-list: fix --reverse interaction with --parents | Thomas Rast | 2008-08-29 | 1 | -0/+42 | |
* | | | | | | | | | Merge branch 'cc/bisect' | Junio C Hamano | 2008-09-18 | 1 | -0/+114 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | bisect: only check merge bases when needed | Christian Couder | 2008-08-27 | 1 | -0/+24 | |
| * | | | | | | | | | bisect: test merge base if good rev is not an ancestor of bad rev | Christian Couder | 2008-08-27 | 1 | -0/+90 | |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-16 | 1 | -11/+14 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | t9700/test.pl: remove File::Temp requirement | Brandon Casey | 2008-09-15 | 1 | -10/+13 | |
| * | | | | | | | | | t9700/test.pl: avoid bareword 'STDERR' in 3-argument open() | Brandon Casey | 2008-09-15 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-10 | 2 | -6/+12 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Use compatibility regex library for OSX/Darwin | Arjen Laarhoven | 2008-09-10 | 1 | -0/+6 | |
| * | | | | | | | | t7501: always use test_cmp instead of diff | Miklos Vajna | 2008-09-10 | 1 | -6/+6 | |
| * | | | | | | | | Merge branch 'jc/maint-log-grep' into maint | Junio C Hamano | 2008-09-10 | 1 | -0/+51 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maint | Junio C Hamano | 2008-09-10 | 1 | -0/+12 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-checkout-fix' into maint | Junio C Hamano | 2008-09-10 | 1 | -0/+22 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | t9101: use "git hash-object" without dash | Nanako Shiraishi | 2008-09-09 | 1 | -14/+14 | |
* | | | | | | | | | | | tests: use "git foo" without dash in strings | Nanako Shiraishi | 2008-09-09 | 9 | -13/+13 | |
* | | | | | | | | | | | t9700: use "git config" without dash | Nanako Shiraishi | 2008-09-09 | 1 | -8/+8 | |
* | | | | | | | | | | | t9300, t9301: use "git fast-import/fast-export" without dash | Nanako Shiraishi | 2008-09-09 | 2 | -41/+41 | |
* | | | | | | | | | | | t9200: use "git cvsexportcommit" without dash | Nanako Shiraishi | 2008-09-09 | 1 | -7/+7 | |
* | | | | | | | | | | | t6023-merge-file: Work around non-portable sed usage | Arjen Laarhoven | 2008-09-08 | 1 | -2/+2 | |
* | | | | | | | | | | | t/t91XX git-svn tests: run "git svn" not "git-svn" | Nanako Shiraishi | 2008-09-08 | 27 | -174/+174 | |
* | | | | | | | | | | | t/t91XX-svn: start removing use of "git-" from these tests | Nanako Shiraishi | 2008-09-08 | 10 | -55/+58 | |
* | | | | | | | | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2008-09-08 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | git-svn: fix handling of even funkier branch names | Eric Wong | 2008-09-06 | 1 | -0/+16 |