| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'mv/merge-noff' | Junio C Hamano | 2008-10-19 | 1 | -0/+16 |
|\ |
|
| * | builtin-commit: use reduce_heads() only when appropriate | Miklos Vajna | 2008-10-03 | 1 | -0/+16 |
* | | Merge branch 'ns/rebase-noverify' | Junio C Hamano | 2008-10-19 | 1 | -0/+16 |
|\ \ |
|
| * | | rebase --no-verify | Nanako Shiraishi | 2008-10-06 | 1 | -0/+16 |
* | | | Merge branch 'maint' | Junio C Hamano | 2008-10-17 | 3 | -1/+35 |
|\ \ \ |
|
| * | | | t1301-shared-repo.sh: don't let a default ACL interfere with the test | Matt McCutchen | 2008-10-16 | 1 | -0/+3 |
| * | | | xdiff-interface.c: strip newline (and cr) from line before pattern matching | Brandon Casey | 2008-10-16 | 1 | -1/+1 |
| * | | | t4018-diff-funcname: demonstrate end of line funcname matching flaw | Brandon Casey | 2008-10-16 | 1 | -0/+6 |
| * | | | t4018-diff-funcname: rework negated last expression test | Brandon Casey | 2008-10-16 | 1 | -1/+2 |
| * | | | Add testcase to ensure merging an early part of a branch is done properly | Miklos Vajna | 2008-10-14 | 1 | -0/+26 |
* | | | | t4018-diff-funcname: add objective-c xfuncname pattern to syntax test | Brandon Casey | 2008-10-14 | 1 | -1/+1 |
* | | | | tests: shell negation portability fix | Jeff King | 2008-10-13 | 1 | -1/+1 |
* | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-12 | 2 | -1/+53 |
|\ \ \ \
| |/ / / |
|
| * | | | test-lib: fix broken printf | Shawn O. Pearce | 2008-10-12 | 1 | -1/+1 |
| * | | | git apply --directory broken for new files | Jeff King | 2008-10-12 | 1 | -0/+52 |
* | | | | "git diff <tree>{3,}": do not reverse order of arguments | Matt McCutchen | 2008-10-12 | 2 | -0/+30 |
* | | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' | Brandon Casey | 2008-10-12 | 1 | -1/+1 |
* | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-10 | 2 | -1/+13 |
|\ \ \ \
| |/ / / |
|
| * | | | rebase -i: do not fail when there is no commit to cherry-pick | Johannes Schindelin | 2008-10-10 | 1 | -0/+11 |
| * | | | test-lib: fix color reset in say_color() | Miklos Vajna | 2008-10-10 | 1 | -1/+2 |
* | | | | Merge branch 'dm/svn-branch' | Shawn O. Pearce | 2008-10-09 | 1 | -0/+59 |
|\ \ \ \ |
|
| * | | | | Add git-svn branch to allow branch creation in SVN repositories | Florian Ragwitz | 2008-10-06 | 1 | -0/+59 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'jc/add-ita' | Shawn O. Pearce | 2008-10-09 | 1 | -0/+36 |
|\ \ \ \ |
|
| * | | | | git-add --intent-to-add (-N) | Junio C Hamano | 2008-08-31 | 1 | -0/+36 |
* | | | | | Merge branch 'mv/merge-refresh' | Shawn O. Pearce | 2008-10-09 | 1 | -0/+9 |
|\ \ \ \ \ |
|
| * | | | | | builtin-merge: refresh the index before calling a strategy | Miklos Vajna | 2008-10-03 | 1 | -0/+9 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-08 | 2 | -8/+49 |
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | git init: --bare/--shared overrides system/global config | Deskin Miller | 2008-10-08 | 1 | -0/+32 |
| * | | | git rm: refresh index before up-to-date check | Johannes Schindelin | 2008-10-08 | 1 | -8/+17 |
* | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-06 | 2 | -0/+147 |
|\ \ \ \
| |/ / /
| | / /
| |/ /
|/| | |
|
| * | | Teach rebase -i to honor pre-rebase hook | Nanako Shiraishi | 2008-10-06 | 1 | -0/+126 |
| * | | fix bogus "diff --git" header from "diff --no-index" | Linus Torvalds | 2008-10-06 | 1 | -0/+21 |
* | | | tests: add a testcase for "git submodule sync" | David Aguilar | 2008-10-02 | 1 | -0/+64 |
* | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-02 | 1 | -0/+49 |
|\ \ \
| |/ / |
|
| * | | gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.sh | Jakub Narebski | 2008-10-02 | 1 | -0/+49 |
* | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-30 | 1 | -0/+0 |
|\ \ \
| |/ / |
|
| * | | t0024: add executable permission | SZEDER Gábor | 2008-09-30 | 1 | -0/+0 |
* | | | tests: grep portability fixes | Jeff King | 2008-09-30 | 8 | -11/+11 |
* | | | Merge branch 'bc/master-diff-hunk-header-fix' | Shawn O. Pearce | 2008-09-29 | 1 | -1/+12 |
|\ \ \ |
|
| * \ \ | Merge branch 'maint' into bc/master-diff-hunk-header-fix | Shawn O. Pearce | 2008-09-29 | 8 | -13/+324 |
| |\ \ \
| | |/ / |
|
| | * | | Merge branch 'bc/maint-diff-hunk-header-fix' into maint | Shawn O. Pearce | 2008-09-29 | 1 | -1/+12 |
| | |\ \ |
|
| * | | | | t4018-diff-funcname: test syntax of builtin xfuncname patterns | Brandon Casey | 2008-09-23 | 1 | -1/+1 |
| * | | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-22 | 1 | -0/+11 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | t4018-diff-funcname: test syntax of builtin xfuncname patterns | Brandon Casey | 2008-09-22 | 1 | -0/+11 |
| * | | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-18 | 5 | -17/+60 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | diff.*.xfuncname which uses "extended" regex's for hunk header selection | Brandon Casey | 2008-09-18 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 | 2 | -2/+165 |
|\ \ \ \ \ |
|
| * | | | | | checkout --conflict=<style>: recreate merge in a non-default style | Junio C Hamano | 2008-08-31 | 1 | -46/+54 |
| * | | | | | checkout -m: recreate merge when checking out of unmerged index | Junio C Hamano | 2008-08-30 | 1 | -0/+63 |
| * | | | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution' | Junio C Hamano | 2008-08-30 | 1 | -0/+70 |
| |\ \ \ \ \ |
|