Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ef/maint-empty-commit-log' into maint | Junio C Hamano | 2010-04-09 | 1 | -0/+9 |
|\ | |||||
| * | rev-list: fix --pretty=oneline with empty message | Erik Faye-Lund | 2010-03-21 | 1 | -0/+9 |
* | | Merge branch 'jc/conflict-marker-size' into maint | Junio C Hamano | 2010-04-09 | 1 | -1/+22 |
|\ \ | |||||
| * | | diff --check: honor conflict-marker-size attribute | Junio C Hamano | 2010-03-24 | 1 | -1/+22 |
* | | | Merge branch 'jc/maint-refs-dangling' into maint | Junio C Hamano | 2010-03-31 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | refs: ref entry with NULL sha1 is can be a dangling symref | Junio C Hamano | 2010-03-15 | 1 | -3/+3 |
* | | | | format-patch: Squelch 'fatal: Not a range." error | Kevin Ballard | 2010-03-29 | 1 | -0/+4 |
* | | | | Merge branch 'cp/add-u-pathspec' into maint | Junio C Hamano | 2010-03-28 | 2 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | test for add with non-existent pathspec | Chris Packham | 2010-02-16 | 2 | -0/+10 |
* | | | | | t9350: fix careless use of "cd" | Junio C Hamano | 2010-03-28 | 1 | -33/+38 |
* | | | | | difftool: Fix '--gui' when diff.guitool is unconfigured | David Aguilar | 2010-03-28 | 1 | -0/+9 |
* | | | | | Merge branch 'jc/color-attrs' into maint | Junio C Hamano | 2010-03-24 | 1 | -4/+11 |
|\ \ \ \ \ | |||||
| * | | | | | color: allow multiple attributes | Junio C Hamano | 2010-03-07 | 1 | -4/+11 |
* | | | | | | Merge branch 'jk/maint-add-ignored-dir' into maint | Junio C Hamano | 2010-03-24 | 2 | -2/+85 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tests for "git add ignored-dir/file" without -f | Junio C Hamano | 2010-03-13 | 1 | -0/+79 |
| * | | | | | | t0050: mark non-working test as such | Junio C Hamano | 2010-03-13 | 1 | -2/+6 |
* | | | | | | | Merge branch 'bg/apply-fix-blank-at-eof' into maint | Junio C Hamano | 2010-03-24 | 3 | -0/+305 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | t3417: Add test cases for "rebase --whitespace=fix" | Björn Gustavsson | 2010-03-06 | 1 | -0/+126 |
| * | | | | | | t4124: Add additional tests of --whitespace=fix | Björn Gustavsson | 2010-03-06 | 1 | -0/+170 |
| * | | | | | | apply: Remove the quick rejection test | Björn Gustavsson | 2010-03-06 | 1 | -0/+9 |
* | | | | | | | don't use default revision if a rev was specified | Dave Olszewski | 2010-03-13 | 1 | -0/+9 |
* | | | | | | | t/Makefile: remove test artifacts upon "make clean" | Junio C Hamano | 2010-03-13 | 1 | -0/+2 |
* | | | | | | | blame: fix indent of line numbers | René Scharfe | 2010-03-13 | 1 | -1/+19 |
* | | | | | | | t9400: Use test_cmp when appropriate | Junio C Hamano | 2010-03-11 | 1 | -12/+12 |
* | | | | | | | Merge branch 'as/maint-expire' into maint | Junio C Hamano | 2010-03-08 | 2 | -0/+73 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | reflog: honor gc.reflogexpire=never | Adam Simpkins | 2010-02-28 | 1 | -0/+41 |
| * | | | | | | | prune: honor --expire=never | Adam Simpkins | 2010-02-28 | 1 | -0/+32 |
* | | | | | | | | Merge branch 'jc/fetch-param' into maint | Junio C Hamano | 2010-03-08 | 1 | -26/+59 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch --all/--multiple: keep all the fetched branch information | Junio C Hamano | 2010-02-24 | 1 | -0/+18 |
| * | | | | | | | | builtin-fetch --all/--multi: propagate options correctly | Junio C Hamano | 2010-02-24 | 1 | -0/+21 |
| * | | | | | | | | t5521: fix and modernize | Junio C Hamano | 2010-02-24 | 1 | -26/+20 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/maint-add--interactive-delete' into maint | Junio C Hamano | 2010-03-08 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add-interactive: fix bogus diff header line ordering | Jeff King | 2010-02-22 | 1 | -0/+8 |
* | | | | | | | | | Merge branch 'mm/mkstemps-mode-for-packfiles' into maint | Junio C Hamano | 2010-03-08 | 1 | -0/+67 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use git_mkstemp_mode instead of plain mkstemp to create object files | Matthieu Moy | 2010-02-22 | 1 | -1/+1 |
| * | | | | | | | | | Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. | Matthieu Moy | 2010-02-22 | 1 | -1/+1 |
| * | | | | | | | | | Add a testcase for ACL with restrictive umask. | Matthieu Moy | 2010-02-22 | 1 | -0/+67 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/maint-fix-mailinfo-strip' into maint | Junio C Hamano | 2010-03-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | mailinfo: do not strip leading spaces even for a header line | Junio C Hamano | 2010-02-19 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'jc/grep-author-all-match-implicit' into maint | Junio C Hamano | 2010-03-08 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | "log --author=me --grep=it" should find intersection, not union | Junio C Hamano | 2010-01-25 | 1 | -1/+9 |
* | | | | | | | | | | | Merge branch 'jc/checkout-detached' into maint | Junio C Hamano | 2010-03-08 | 1 | -10/+22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Reword "detached HEAD" notification | Junio C Hamano | 2010-01-29 | 1 | -10/+22 |
* | | | | | | | | | | | | unset GREP_OPTIONS in test-lib.sh | Bert Wesarg | 2010-03-07 | 1 | -0/+2 |
* | | | | | | | | | | | | t7406: Fix submodule init config tests | Stephen Boyd | 2010-03-06 | 1 | -8/+16 |
* | | | | | | | | | | | | Merge branch 'jn/maint-fix-pager' into maint | Junio C Hamano | 2010-03-04 | 2 | -0/+234 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | tests: Fix race condition in t7006-pager | Jonathan Nieder | 2010-02-22 | 1 | -6/+6 |
| * | | | | | | | | | | | | t7006-pager: if stdout is not a terminal, make a new one | Jonathan Nieder | 2010-02-21 | 2 | -11/+82 |
| * | | | | | | | | | | | | tests: Add tests for automatic use of pager | Jonathan Nieder | 2010-02-20 | 1 | -0/+163 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'ld/maint-diff-quiet-w' into maint | Junio C Hamano | 2010-03-04 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ |