Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | | | | am: Add --committer-date-is-author-date option | Junio C Hamano | 2009-01-25 | 1 | -0/+20 |
* | | | | | | | | | | tests: fix test_commit() for case insensitive filesystems | Junio C Hamano | 2009-02-03 | 1 | -1/+1 |
* | | | | | | | | | | t3412: further simplify setting of GIT_EDITOR | Junio C Hamano | 2009-02-03 | 1 | -4/+0 |
* | | | | | | | | | | Merge branch 'jc/maint-add-u-remove-conflicted' | Junio C Hamano | 2009-02-03 | 1 | -1/+49 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add -u: do not fail to resolve a path as deleted | Junio C Hamano | 2009-01-28 | 1 | -1/+49 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | t3412: use log|name-rev instead of log --graph | Thomas Rast | 2009-02-01 | 1 | -26/+39 |
* | | | | | | | | | | mailinfo: cleanup extra spaces for complex 'From:' | Kirill Smelkov | 2009-02-01 | 3 | -4/+4 |
* | | | | | | | | | | Merge branch 'ks/maint-mailinfo-folded' | Junio C Hamano | 2009-01-31 | 21 | -2/+209 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | mailinfo: tests for RFC2047 examples | Kirill Smelkov | 2009-01-28 | 14 | -0/+100 |
| * | | | | | | | | | | mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)' | Kirill Smelkov | 2009-01-28 | 5 | -1/+11 |
| * | | | | | | | | | | mailinfo: 'From:' header should be unfold as well | Kirill Smelkov | 2009-01-12 | 1 | -1/+4 |
| * | | | | | | | | | | mailinfo: correctly handle multiline 'Subject:' header | Kirill Smelkov | 2009-01-10 | 5 | -1/+95 |
* | | | | | | | | | | | Merge branch 'jc/maint-allow-uninteresting-missing' | Junio C Hamano | 2009-01-31 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | revision traversal: allow UNINTERESTING objects to be missing | Junio C Hamano | 2009-01-28 | 1 | -0/+37 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jg/tag-contains' | Junio C Hamano | 2009-01-31 | 1 | -0/+115 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-tag: Add --contains option | Jake Goulding | 2009-01-28 | 1 | -0/+115 |
* | | | | | | | | | | | | Merge branch 'js/maint-rebase-i-submodule' | Junio C Hamano | 2009-01-31 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix submodule squashing into unrelated commit | Johannes Schindelin | 2009-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | rebase -i squashes submodule changes into unrelated commit | Junio C Hamano | 2009-01-28 | 1 | -0/+26 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jc/maint-split-diff-metainfo' | Junio C Hamano | 2009-01-31 | 2 | -1/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me... | Junio C Hamano | 2009-01-27 | 2 | -1/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |