Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-29 |
|\ | |||
| * | git-p4: add tests demonstrating spec overlay ambiguities | Pete Wyckoff | 2012-01-11 |
| * | git-p4: adjust test to adhere to stricter useClientSpec | Pete Wyckoff | 2012-01-11 |
| * | git-p4: only a single ... wildcard is supported | Pete Wyckoff | 2012-01-11 |
* | | Merge branch 'jn/gitweb-unspecified-action' | Junio C Hamano | 2012-01-29 |
|\ \ | |||
| * | | gitweb: Fix actionless dispatch for non-existent objects | Jakub Narebski | 2012-01-09 |
* | | | Merge branch 'cb/push-quiet' | Junio C Hamano | 2012-01-29 |
|\ \ \ | |||
| * | | | t5541: avoid TAP test miscounting | Michael J Gruber | 2012-01-08 |
| * | | | fix push --quiet: add 'quiet' capability to receive-pack | Clemens Buchacher | 2012-01-08 |
* | | | | Merge branch 'nd/clone-single-branch' | Junio C Hamano | 2012-01-29 |
|\ \ \ \ | |||
| * | | | | clone: add --single-branch to fetch only one branch | Nguyễn Thái Ngọc Duy | 2012-01-08 |
* | | | | | Merge branch 'cb/git-daemon-tests' | Junio C Hamano | 2012-01-29 |
|\ \ \ \ \ | |||
| * | | | | | git-daemon tests: wait until daemon is ready | Clemens Buchacher | 2012-01-08 |
| * | | | | | git-daemon: add tests | Clemens Buchacher | 2012-01-08 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'nd/pathspec-recursion-cleanup' | Junio C Hamano | 2012-01-18 |
|\ \ \ \ \ | |||
| * | | | | | diff-index: enable recursive pathspec matching in unpack_trees | Nguyen Thai Ngoc Duy | 2012-01-16 |
* | | | | | | Merge branch 'tr/maint-word-diff-incomplete-line' | Junio C Hamano | 2012-01-18 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | word-diff: ignore '\ No newline at eof' marker | Thomas Rast | 2012-01-12 |
* | | | | | | Merge branch 'ss/maint-msys-cvsexportcommit' | Junio C Hamano | 2012-01-12 |
|\ \ \ \ \ \ | |||
| * | | | | | | t9200: On MSYS, do not pass Windows-style paths to CVS | Sebastian Schuberth | 2012-01-11 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-11 |
|\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-11 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | * | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-11 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||
| | | * | | | | | t2203: fix wrong commit command | Nguyễn Thái Ngọc Duy | 2012-01-11 |
* | | | | | | | | Merge branch 'bw/maint-t8006-sed-incomplete-line' | Junio C Hamano | 2012-01-10 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Use perl instead of sed for t8006-blame-textconv test | Ben Walton | 2012-01-09 |
* | | | | | | | | | Sync with maint | Junio C Hamano | 2012-01-10 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | |_|_|_|/ / / / |/| | | | | | | | |||
| * | | | | | | | Merge the attributes fix in from maint-1.6.7 branch | Junio C Hamano | 2012-01-10 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | | | |||
| | * | | | | | Merge the attributes fix in from maint-1.6.6 branch | Junio C Hamano | 2012-01-10 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||
| | | * | | | | attr: don't confuse prefixes with leading directories | Jeff King | 2012-01-10 |
* | | | | | | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 |
| * | | | | | | | test "commit -S" and "log --show-signature" | Junio C Hamano | 2011-11-12 |
* | | | | | | | | Merge branch 'jm/stash-diff-disambiguate' | Junio C Hamano | 2012-01-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | stash: Don't fail if work dir contains file named 'HEAD' | Jonathon Mah | 2012-01-01 |
* | | | | | | | | | Merge branch 'jh/fetch-head-update' | Junio C Hamano | 2012-01-06 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | write first for-merge ref to FETCH_HEAD first | Joey Hess | 2012-01-03 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-06 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| * | | | | | | | | git-p4: rewrite view handling | Pete Wyckoff | 2012-01-03 |
| * | | | | | | | | git-p4: support single file p4 client view maps | Gary Gibbons | 2012-01-03 |
| * | | | | | | | | git-p4: sort client views by reverse View number | Gary Gibbons | 2012-01-03 |
| * | | | | | | | | git-p4: fix test for unsupported P4 Client Views | Gary Gibbons | 2012-01-03 |
| * | | | | | | | | git-p4: test client view handling | Pete Wyckoff | 2012-01-03 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-04 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | t5550: repack everything into one file | Clemens Buchacher | 2012-01-04 |
* | | | | | | | Merge branch 'pw/p4-docs-and-tests' | Junio C Hamano | 2012-01-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | git-p4: document and test submit options | Pete Wyckoff | 2011-12-27 |
| * | | | | | | | git-p4: test and document --use-client-spec | Pete Wyckoff | 2011-12-27 |
| * | | | | | | | git-p4: test --keep-path | Pete Wyckoff | 2011-12-27 |
| * | | | | | | | git-p4: test --max-changes | Pete Wyckoff | 2011-12-27 |