Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/tutorial-test' | Junio C Hamano | 2009-11-17 | 1 | -61/+159 |
|\ | |||||
| * | t1200: prepare for merging with Fast-forward bikeshedding | Junio C Hamano | 2009-11-06 | 1 | -2/+3 |
| * | t1200: further modernize test script style | Junio C Hamano | 2009-11-06 | 1 | -18/+18 |
| * | t1200: Make documentation and test agree | Stephen Boyd | 2009-11-06 | 1 | -9/+88 |
| * | t1200: cleanup and modernize test style | Stephen Boyd | 2009-11-06 | 1 | -58/+76 |
* | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2009-11-17 | 6 | -60/+476 |
|\ \ | |||||
| * | | git svn: attempt to create empty dirs on clone+rebase | Eric Wong | 2009-11-15 | 2 | -2/+87 |
| * | | git svn: add authorsfile test case for ~/.gitconfig | Eric Wong | 2009-11-14 | 1 | -0/+23 |
| * | | git svn: handle SVN merges from revisions past the tip of the branch | Toby Allsopp | 2009-11-14 | 3 | -58/+366 |
* | | | Merge branch 'js/maint-diff-color-words' | Junio C Hamano | 2009-11-15 | 1 | -0/+20 |
|\ \ \ | |||||
| * | | | diff --color-words -U0: fix the location of hunk headers | Johannes Schindelin | 2009-10-30 | 1 | -1/+1 |
| * | | | t4034-diff-words: add a test for word diff without context | Markus Heidelberg | 2009-10-30 | 1 | -0/+20 |
* | | | | Merge branch 'fc/doc-fast-forward' | Junio C Hamano | 2009-11-15 | 4 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-24 | 4 | -6/+6 |
| |/ / / | |||||
* | | | | Merge branch 'jk/maint-add-p-empty' | Junio C Hamano | 2009-11-15 | 1 | -0/+17 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | add-interactive: handle deletion of empty files | Jeff King | 2009-10-27 | 1 | -0/+17 |
| |/ / | |||||
* | | | Merge branch 'jk/maint-format-patch-p-suppress-stat' | Junio C Hamano | 2009-11-10 | 1 | -0/+21 |
|\ \ \ | |||||
| * | | | format-patch: make "-p" suppress diffstat | Jeff King | 2009-11-08 | 1 | -0/+21 |
| |/ / | |||||
* | | | Merge branch 'jk/maint-1.6.3-ls-files-i' | Junio C Hamano | 2009-11-10 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | ls-files: unbreak "ls-files -i" | Jeff King | 2009-10-30 | 1 | -0/+8 |
* | | | | Merge branch 'bg/merge-ff-only' | Junio C Hamano | 2009-11-10 | 1 | -0/+41 |
|\ \ \ \ | |||||
| * | | | | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 2009-10-30 | 1 | -0/+41 |
* | | | | | Merge branch 'jp/dirty-describe' | Junio C Hamano | 2009-11-10 | 1 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Teach "git describe" --dirty option | Jean Privat | 2009-10-27 | 1 | -0/+14 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jc/commit-s-subject-is-not-a-footer' | Junio C Hamano | 2009-11-06 | 1 | -0/+9 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | builtin-commit.c: fix logic to omit empty line before existing footers | Junio C Hamano | 2009-11-06 | 1 | -0/+9 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jn/show-normalized-refs' | Junio C Hamano | 2009-11-02 | 1 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | t1402: Make test executable | Stephen Boyd | 2009-11-02 | 1 | -0/+0 |
* | | | | | fixup tr/stash-format merge | Junio C Hamano | 2009-10-30 | 1 | -0/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Introduce new pretty formats %g[sdD] for reflog information | Thomas Rast | 2009-10-19 | 1 | -0/+18 |
* | | | | | | Merge branch 'js/diff-verbose-submodule' | Junio C Hamano | 2009-10-30 | 1 | -0/+260 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add tests for git diff --submodule | Jens Lehmann | 2009-10-23 | 1 | -0/+260 |
* | | | | | | | Merge branch 'jn/show-normalized-refs' | Junio C Hamano | 2009-10-30 | 1 | -0/+61 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | git check-ref-format --print | Junio C Hamano | 2009-10-12 | 1 | -0/+17 |
| * | | | | | | Add tests for git check-ref-format | Jonathan Nieder | 2009-10-12 | 1 | -0/+44 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | t915{0,1}: use $TEST_DIRECTORY | Jeff King | 2009-10-30 | 2 | -2/+4 |
* | | | | | | Make t9150 and t9151 test scripts executable | Michael J Gruber | 2009-10-30 | 2 | -0/+0 |
| |_|_|/ / |/| | | | | |||||
* | | | | | commit: More generous accepting of RFC-2822 footer lines. | David Brown | 2009-10-28 | 1 | -0/+41 |
* | | | | | git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents | Sam Vilain | 2009-10-26 | 1 | -0/+21 |
* | | | | | git-svn: add test data for SVN 1.5+ merge, with script. | Sam Vilain | 2009-10-26 | 3 | -0/+811 |
* | | | | | git-svn: convert SVK merge tickets to extra parents | Sam Vilain | 2009-10-26 | 1 | -0/+23 |
* | | | | | git-svn: allow test setup script to support PERL env. var | Sam Vilain | 2009-10-26 | 1 | -2/+3 |
* | | | | | git-svn: add test data for SVK merge, with script. | Sam Vilain | 2009-10-26 | 2 | -0/+673 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-25 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test | Markus Heidelberg | 2009-10-24 | 1 | -1/+1 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-23 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'jp/maint-send-email-fold' into maint | Junio C Hamano | 2009-10-23 | 1 | -20/+74 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'pv/maint-add-p-no-exclude' into maint | Junio C Hamano | 2009-10-23 | 1 | -0/+14 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Do not fail "describe --always" in a tag-less repository | Junio C Hamano | 2009-10-23 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-21 | 2 | -35/+4 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |