Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | t/Makefile: Use $(sort ...) explicitly where neededks/sort-wildcard-in-makefile | Kirill Smelkov | 2012-01-22 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | Merge branch 'ld/git-p4-branches-and-labels' | Junio C Hamano | 2012-01-31 | 2 | -0/+161 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | git-p4: label import fails with multiple labels at the same changelistld/git-p4-branches-and-labels | Luke Diamand | 2012-01-20 | 1 | -0/+41 | |
| * | | | | | | | | | | | | | | git-p4: add test for p4 labels | Luke Diamand | 2012-01-20 | 1 | -0/+72 | |
| * | | | | | | | | | | | | | | git-p4: handle p4 branches and labels containing shell chars | Luke Diamand | 2012-01-20 | 1 | -0/+48 | |
* | | | | | | | | | | | | | | | Merge branch 'rs/diff-postimage-in-context' | Junio C Hamano | 2012-01-29 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | xdiff: print post-image for common records instead of pre-imagers/diff-postimage-in-context | René Scharfe | 2012-01-06 | 1 | -7/+7 | |
* | | | | | | | | | | | | | | | | Merge branch 'sp/smart-http-failure-to-push' | Junio C Hamano | 2012-01-29 | 1 | -0/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | remote-curl: Fix push status report when all branches fail | Shawn O. Pearce | 2012-01-20 | 1 | -0/+28 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-log-first-parent-pathspec' | Junio C Hamano | 2012-01-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Making pathspec limited log play nicer with --first-parentjc/maint-log-first-parent-pathspec | Junio C Hamano | 2012-01-19 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jl/test-pause' | Junio C Hamano | 2012-01-29 | 2 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | test-lib: add the test_pause convenience functionjl/test-pause | Jens Lehmann | 2012-01-17 | 2 | -0/+26 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-mailinfo' | Junio C Hamano | 2012-01-29 | 1 | -2/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | mailinfo: with -b, keep space after [foo]tr/maint-mailinfo | Thomas Rast | 2012-01-16 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | am: learn passing -b to mailinfo | Thomas Rast | 2012-01-16 | 1 | -2/+12 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-29 | 2 | -3/+396 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | git-p4: add tests demonstrating spec overlay ambiguitiespw/p4-view-updates | Pete Wyckoff | 2012-01-11 | 1 | -0/+387 | |
| * | | | | | | | | | | | | | | | | | | | git-p4: adjust test to adhere to stricter useClientSpec | Pete Wyckoff | 2012-01-11 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | git-p4: only a single ... wildcard is supported | Pete Wyckoff | 2012-01-11 | 1 | -1/+7 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-unspecified-action' | Junio C Hamano | 2012-01-29 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | gitweb: Fix actionless dispatch for non-existent objectsjn/gitweb-unspecified-action | Jakub Narebski | 2012-01-09 | 1 | -0/+8 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/push-quiet' | Junio C Hamano | 2012-01-29 | 2 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | t5541: avoid TAP test miscountingcb/push-quiet | Michael J Gruber | 2012-01-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | fix push --quiet: add 'quiet' capability to receive-pack | Clemens Buchacher | 2012-01-08 | 2 | -0/+15 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/clone-single-branch' | Junio C Hamano | 2012-01-29 | 1 | -1/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | clone: add --single-branch to fetch only one branchnd/clone-single-branch | Nguyễn Thái Ngọc Duy | 2012-01-08 | 1 | -1/+71 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/git-daemon-tests' | Junio C Hamano | 2012-01-29 | 2 | -0/+217 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | git-daemon tests: wait until daemon is readycb/git-daemon-tests | Clemens Buchacher | 2012-01-08 | 1 | -1/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | git-daemon: add tests | Clemens Buchacher | 2012-01-08 | 2 | -0/+201 | |
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/pathspec-recursion-cleanup' | Junio C Hamano | 2012-01-18 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | diff-index: enable recursive pathspec matching in unpack_treesnd/pathspec-recursion-cleanup | Nguyen Thai Ngoc Duy | 2012-01-16 | 1 | -0/+8 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-word-diff-incomplete-line' | Junio C Hamano | 2012-01-18 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | word-diff: ignore '\ No newline at eof' markertr/maint-word-diff-incomplete-line | Thomas Rast | 2012-01-12 | 1 | -0/+14 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/maint-msys-cvsexportcommit' | Junio C Hamano | 2012-01-12 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | t9200: On MSYS, do not pass Windows-style paths to CVS | Sebastian Schuberth | 2012-01-11 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-11 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | t2203: fix wrong commit command | Nguyễn Thái Ngọc Duy | 2012-01-11 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/maint-t8006-sed-incomplete-line' | Junio C Hamano | 2012-01-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Use perl instead of sed for t8006-blame-textconv testbw/maint-t8006-sed-incomplete-line | Ben Walton | 2012-01-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2012-01-10 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge the attributes fix in from maint-1.6.7 branch | Junio C Hamano | 2012-01-10 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | / / / / / / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge the attributes fix in from maint-1.6.6 branch | Junio C Hamano | 2012-01-10 | 1 | -0/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | attr: don't confuse prefixes with leading directories | Jeff King | 2012-01-10 | 1 | -0/+10 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 | 1 | -0/+80 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 | 1 | -1/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | test "commit -S" and "log --show-signature" | Junio C Hamano | 2011-11-12 | 1 | -0/+71 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/stash-diff-disambiguate' | Junio C Hamano | 2012-01-06 | 3 | -28/+76 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |