Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2009-02-11 | 1 | -0/+39 |
|\ | |||||
| * | Merge branch 'maint-1.5.6' into maint | Junio C Hamano | 2009-02-11 | 1 | -0/+39 |
| |\ | |||||
| | * | Merge branch 'maint-1.5.5' into maint-1.5.6 | Junio C Hamano | 2009-02-11 | 1 | -0/+39 |
| | |\ | |||||
| | | * | Merge branch 'maint-1.5.4' into maint-1.5.5 | Junio C Hamano | 2009-02-11 | 1 | -0/+39 |
| | | |\ | |||||
| | | | * | revision traversal and pack: notice and die on missing commit | Junio C Hamano | 2009-02-11 | 1 | -0/+39 |
| * | | | | Merge branch 'sg/maint-gitdir-in-subdir' into maint | Junio C Hamano | 2009-02-05 | 1 | -0/+7 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/maint-split-diff-metainfo' into maint | Junio C Hamano | 2009-02-05 | 2 | -1/+19 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'js/maint-all-implies-HEAD' into maint | Junio C Hamano | 2009-02-05 | 2 | -2/+40 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'kc/maint-diff-bwi-fix' into maint | Junio C Hamano | 2009-02-05 | 1 | -0/+27 |
| |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | receive-pack: receive.denyDeleteCurrent | Junio C Hamano | 2009-02-10 | 1 | -0/+13 |
* | | | | | | | | | Warn use of "origin" when remotes/origin/HEAD is dangling | Junio C Hamano | 2009-02-10 | 1 | -0/+6 |
* | | | | | | | | | remote prune: warn dangling symrefs | Junio C Hamano | 2009-02-10 | 1 | -0/+21 |
* | | | | | | | | | Modernize t5400 test script | Junio C Hamano | 2009-02-10 | 1 | -86/+94 |
* | | | | | | | | | Revert "Merge branch 'js/notes'" | Junio C Hamano | 2009-02-10 | 2 | -193/+0 |
* | | | | | | | | | Merge branch 'js/git-submodule-trailing-slash' | Junio C Hamano | 2009-02-10 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodule: warn about non-submodules | Johannes Schindelin | 2009-02-07 | 1 | -0/+7 |
| * | | | | | | | | | Let ls-files strip trailing slashes in submodules' paths | Johannes Schindelin | 2009-02-07 | 1 | -0/+6 |
* | | | | | | | | | | Merge branch 'js/maint-1.6.0-path-normalize' | Junio C Hamano | 2009-02-10 | 2 | -19/+20 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Test and fix normalize_path_copy() | Johannes Sixt | 2009-02-07 | 1 | -16/+17 |
| * | | | | | | | | | | Fix GIT_CEILING_DIRECTORIES on Windows | René Scharfe | 2009-02-07 | 1 | -3/+3 |
* | | | | | | | | | | | Add two extra tests for git rebase | Johannes Schindelin | 2009-02-08 | 1 | -1/+12 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'js/filter-branch-submodule' | Junio C Hamano | 2009-02-07 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | filter-branch: Fix fatal error on bare repositories | Eric Kidd | 2009-02-03 | 1 | -1/+3 |
* | | | | | | | | | | | Merge branch 'js/maint-remote-remove-mirror' | Junio C Hamano | 2009-02-05 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | builtin-remote: make rm operation safer in mirrored repository | Jay Soffian | 2009-02-04 | 1 | -0/+26 |
* | | | | | | | | | | | | Merge branch 'js/notes' | Junio C Hamano | 2009-02-05 | 2 | -0/+193 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-notes: fix printing of multi-line notes | Tor Arne Vestbø | 2009-01-14 | 1 | -1/+31 |
| * | | | | | | | | | | | | Add an expensive test for git-notes | Johannes Schindelin | 2009-01-11 | 1 | -0/+98 |
| * | | | | | | | | | | | | Add a script to edit/inspect notes | Johannes Schindelin | 2008-12-21 | 1 | -0/+65 |
* | | | | | | | | | | | | | Merge branch 'jc/refuse-push-to-current' | Junio C Hamano | 2009-02-05 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | receive-pack: explain what to do when push updates the current branch | Junio C Hamano | 2009-02-03 | 1 | -3/+3 |
* | | | | | | | | | | | | | | Merge branch 'jk/head-symref' | Junio C Hamano | 2009-02-05 | 1 | -0/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | symbolic ref: refuse non-ref targets in HEAD | Jeff King | 2009-01-29 | 1 | -0/+41 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'cb/mergetool' | Junio C Hamano | 2009-02-05 | 1 | -16/+59 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | mergetool: fix running mergetool in sub-directories | Charles Bailey | 2009-01-31 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | mergetool: Add a test for running mergetool in a sub-directory | Charles Bailey | 2009-01-31 | 1 | -19/+51 |
| * | | | | | | | | | | | | | | mergetool: respect autocrlf by using checkout-index | Charles Bailey | 2009-01-27 | 1 | -2/+13 |
* | | | | | | | | | | | | | | | Merge branch 'jc/fsck' (early part) | Junio C Hamano | 2009-02-04 | 1 | -0/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | fsck: check loose objects from alternate object stores by default | Junio C Hamano | 2009-01-30 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | | fsck: HEAD is part of refs | Junio C Hamano | 2009-01-30 | 1 | -0/+19 |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-02-04 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-02-04 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | / / / / / / / / | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | builtin-mv.c: check for unversionned files before looking at the destination. | Matthieu Moy | 2009-02-04 | 1 | -1/+1 |
| | * | | | | | | | | | | | | Add a testcase for "git mv -f" on untracked files. | Matthieu Moy | 2009-02-04 | 1 | -0/+8 |
| | * | | | | | | | | | | | | Missing && in t/t7001.sh. | Matthieu Moy | 2009-02-04 | 1 | -1/+1 |
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'jc/maint-format-patch-o-relative' into maint | Junio C Hamano | 2009-01-28 | 1 | -1/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/grep-assume-unchanged' into maint | Junio C Hamano | 2009-01-28 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mc/cd-p-pwd' into maint | Junio C Hamano | 2009-01-28 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ns/am-slacker' | Junio C Hamano | 2009-02-04 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | git-am: Add --ignore-date option | Nanako Shiraishi | 2009-01-25 | 1 | -0/+13 |