Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'sp/smart-http-content-type-check' | Junio C Hamano | 2013-02-10 |
|\ | |||
| * | t5551: fix expected error output | Junio C Hamano | 2013-02-04 |
| * | Verify Content-Type from smart HTTP servers | Shawn Pearce | 2013-02-04 |
| * | Merge branch 'tb/t0050-maint' into maint | Junio C Hamano | 2013-01-30 |
| |\ | |||
| * \ | Merge branch 'ap/status-ignored-in-ignored-directory' into maint | Junio C Hamano | 2013-01-28 |
| |\ \ | |||
| * \ \ | Merge branch 'mh/ceiling' into maint | Junio C Hamano | 2013-01-28 |
| |\ \ \ | |||
* | \ \ \ | Merge branch 'jc/combine-diff-many-parents' | Junio C Hamano | 2013-02-08 |
|\ \ \ \ \ | |||
| * | | | | | t4038: add tests for "diff --cc --raw <trees>" | John Keeping | 2013-02-05 |
* | | | | | | Merge branch 'nd/branch-error-cases' | Junio C Hamano | 2013-02-07 |
|\ \ \ \ \ \ | |||
| * | | | | | | branch: let branch filters imply --list | Jeff King | 2013-01-31 |
| * | | | | | | branch: give a more helpful message on redundant arguments | Nguyễn Thái Ngọc Duy | 2013-01-30 |
* | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' | Junio C Hamano | 2013-02-05 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | git-am: record full index line in the patch used while rebasing | Junio C Hamano | 2013-01-31 |
* | | | | | | | | Merge branch 'pw/git-p4-on-cygwin' | Junio C Hamano | 2013-02-04 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git p4 test: use test_chmod for cygwin | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4: cygwin p4 client does not mark read-only | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4 test: avoid wildcard * in windows | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4 test: use LineEnd unix in windows tests too | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4 test: newline handling | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4 test: translate windows paths for cygwin | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4 test: start p4d inside its db dir | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4 test: use client_view in t9806 | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4 test: avoid loop in client_view | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4 test: use client_view to build the initial client | Pete Wyckoff | 2013-01-26 |
| * | | | | | | | | git p4: generate better error message for bad depot path | Pete Wyckoff | 2013-01-26 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free' | Junio C Hamano | 2013-02-04 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | logmsg_reencode: lazily load missing commit buffers | Jeff King | 2013-01-26 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'jk/config-parsing-cleanup' | Junio C Hamano | 2013-02-04 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | archive-tar: use parse_config_key when parsing config | Jeff King | 2013-01-23 |
* | | | | | | | | | Merge branch 'jc/custom-comment-char' | Junio C Hamano | 2013-02-04 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Allow custom "comment char" | Junio C Hamano | 2013-01-16 |
* | | | | | | | | | | Merge branch 'bc/git-p4-for-python-2.4' | Junio C Hamano | 2013-02-01 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | git-p4.py: support Python 2.4 | Brandon Casey | 2013-01-26 |
* | | | | | | | | | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' | Junio C Hamano | 2013-02-01 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t9902: protect test from stray build artifacts | Junio C Hamano | 2013-01-24 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'as/test-cleanup' | Junio C Hamano | 2013-02-01 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t7102 (reset): don't hardcode SHA-1 in expected outputs | Alexey Shumkin | 2013-01-24 |
| |/ / / / / / / / / / | |||
| * | | | | | | | | | | Merge branch 'rs/zip-tests' into maint | Junio C Hamano | 2013-01-20 |
| |\ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/fetch-depth-is-broken' | Junio C Hamano | 2013-02-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | upload-pack: fix off-by-one depth calculation in shallow clone | Nguyễn Thái Ngọc Duy | 2013-01-11 |
| * | | | | | | | | | | | | fetch: add --unshallow for turning shallow repo into complete one | Nguyễn Thái Ngọc Duy | 2013-01-11 |
* | | | | | | | | | | | | | Merge branch 'nd/magic-pathspec-from-root' | Junio C Hamano | 2013-01-30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Update :/abc ambiguity check | Nguyễn Thái Ngọc Duy | 2013-01-21 |
* | | | | | | | | | | | | | | Merge branch 'tb/t0050-maint' | Junio C Hamano | 2013-01-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | t0050: Use TAB for indentation | Torsten Bögershausen | 2013-01-21 |
| * | | | | | | | | | | | | t0050: honor CASE_INSENSITIVE_FS in add (with different case) | Torsten Bögershausen | 2013-01-21 |
| * | | | | | | | | | | | | t0050: known breakage vanished in merge (case change) | Torsten Bögershausen | 2013-01-21 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'for-junio' of git://bogomips.org/git-svn | Junio C Hamano | 2013-01-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | git-svn: Simplify calculation of GIT_DIR | Barry Wardell | 2013-01-24 |
* | | | | | | | | | | | | | Merge branch 'nd/retire-fnmatch' | Junio C Hamano | 2013-01-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |