Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | diff.c: output correct index lines for a split diff | Junio C Hamano | 2009-01-27 | 1 | -0/+18 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/signal-cleanup' | Junio C Hamano | 2009-01-31 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t0005: use SIGTERM for sigchain test | Jeff King | 2009-01-30 | 1 | -1/+1 |
| * | | | | | | | | | | chain kill signals for cleanup functions | Jeff King | 2009-01-21 | 1 | -0/+22 |
* | | | | | | | | | | | t3412: clean up GIT_EDITOR usage | Thomas Rast | 2009-01-30 | 1 | -25/+13 |
* | | | | | | | | | | | Fix 'git diff --no-index' with a non-existing symlink target | Johannes Schindelin | 2009-01-30 | 1 | -0/+7 |
* | | | | | | | | | | | Simplify t3412 | Johannes Schindelin | 2009-01-28 | 1 | -21/+7 |
* | | | | | | | | | | | Simplify t3411 | Johannes Schindelin | 2009-01-28 | 1 | -48/+17 |
* | | | | | | | | | | | Simplify t3410 | Johannes Schindelin | 2009-01-28 | 1 | -89/+35 |
* | | | | | | | | | | | test-lib.sh: introduce test_commit() and test_merge() helpers | Johannes Schindelin | 2009-01-28 | 2 | -0/+43 |
* | | | | | | | | | | | lib-rebase.sh: Document what set_fake_editor() does | Johannes Schindelin | 2009-01-28 | 1 | -0/+12 |
* | | | | | | | | | | | t3404 & t3411: undo copy&paste | Johannes Schindelin | 2009-01-28 | 3 | -67/+44 |
* | | | | | | | | | | | Merge branch 'tr/previous-branch' | Junio C Hamano | 2009-01-28 | 2 | -0/+163 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | t1505: remove debugging cruft | Thomas Rast | 2009-01-25 | 1 | -2/+0 |
| * | | | | | | | | | | Fix parsing of @{-1}@{1} | Johannes Schindelin | 2009-01-19 | 1 | -1/+1 |
| * | | | | | | | | | | interpret_nth_last_branch(): avoid traversing the reflog twice | Junio C Hamano | 2009-01-19 | 1 | -0/+44 |
| * | | | | | | | | | | checkout: implement "-" abbreviation, add docs and tests | Thomas Rast | 2009-01-17 | 1 | -0/+50 |
| * | | | | | | | | | | sha1_name: support @{-N} syntax in get_sha1() | Thomas Rast | 2009-01-17 | 1 | -0/+71 |
* | | | | | | | | | | | Windows: Fix intermittent failures of t7701 | Johannes Sixt | 2009-01-28 | 1 | -7/+7 |