Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/fake-ancestor-with-non-blobs' | Junio C Hamano | 2013-02-05 | 1 | -2/+28 |
|\ | |||||
| * | git-am: record full index line in the patch used while rebasing | Junio C Hamano | 2013-01-31 | 1 | -2/+28 |
* | | Merge branch 'pw/git-p4-on-cygwin' | Junio C Hamano | 2013-02-04 | 9 | -66/+252 |
|\ \ | |||||
| * | | git p4 test: use test_chmod for cygwin | Pete Wyckoff | 2013-01-26 | 1 | -4/+7 |
| * | | git p4: cygwin p4 client does not mark read-only | Pete Wyckoff | 2013-01-26 | 3 | -4/+27 |
| * | | git p4 test: avoid wildcard * in windows | Pete Wyckoff | 2013-01-26 | 2 | -10/+37 |
| * | | git p4 test: use LineEnd unix in windows tests too | Pete Wyckoff | 2013-01-26 | 1 | -0/+1 |
| * | | git p4 test: newline handling | Pete Wyckoff | 2013-01-26 | 1 | -0/+117 |
| * | | git p4 test: translate windows paths for cygwin | Pete Wyckoff | 2013-01-26 | 3 | -3/+26 |
| * | | git p4 test: start p4d inside its db dir | Pete Wyckoff | 2013-01-26 | 1 | -2/+5 |
| * | | git p4 test: use client_view in t9806 | Pete Wyckoff | 2013-01-26 | 2 | -30/+23 |
| * | | git p4 test: avoid loop in client_view | Pete Wyckoff | 2013-01-26 | 2 | -4/+2 |
| * | | git p4 test: use client_view to build the initial client | Pete Wyckoff | 2013-01-26 | 1 | -9/+2 |
| * | | git p4: generate better error message for bad depot path | Pete Wyckoff | 2013-01-26 | 1 | -0/+5 |
* | | | Merge branch 'jk/read-commit-buffer-data-after-free' | Junio C Hamano | 2013-02-04 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | logmsg_reencode: lazily load missing commit buffers | Jeff King | 2013-01-26 | 1 | -0/+8 |
| |/ / | |||||
* | | | Merge branch 'jk/config-parsing-cleanup' | Junio C Hamano | 2013-02-04 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | archive-tar: use parse_config_key when parsing config | Jeff King | 2013-01-23 | 1 | -1/+2 |
* | | | | Merge branch 'jc/custom-comment-char' | Junio C Hamano | 2013-02-04 | 3 | -0/+92 |
|\ \ \ \ | |||||
| * | | | | Allow custom "comment char" | Junio C Hamano | 2013-01-16 | 3 | -0/+92 |
* | | | | | Merge branch 'bc/git-p4-for-python-2.4' | Junio C Hamano | 2013-02-01 | 1 | -5/+6 |
|\ \ \ \ \ | |||||
| * | | | | | git-p4.py: support Python 2.4 | Brandon Casey | 2013-01-26 | 1 | -5/+6 |
* | | | | | | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' | Junio C Hamano | 2013-02-01 | 1 | -1/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t9902: protect test from stray build artifacts | Junio C Hamano | 2013-01-24 | 1 | -1/+24 |
* | | | | | | | Merge branch 'as/test-cleanup' | Junio C Hamano | 2013-02-01 | 1 | -20/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7102 (reset): don't hardcode SHA-1 in expected outputs | Alexey Shumkin | 2013-01-24 | 1 | -20/+21 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'rs/zip-tests' into maint | Junio C Hamano | 2013-01-20 | 5 | -80/+140 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'nd/fetch-depth-is-broken' | Junio C Hamano | 2013-02-01 | 1 | -6/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | upload-pack: fix off-by-one depth calculation in shallow clone | Nguyễn Thái Ngọc Duy | 2013-01-11 | 1 | -6/+19 |
| * | | | | | | | | fetch: add --unshallow for turning shallow repo into complete one | Nguyễn Thái Ngọc Duy | 2013-01-11 | 1 | -0/+20 |
* | | | | | | | | | Merge branch 'nd/magic-pathspec-from-root' | Junio C Hamano | 2013-01-30 | 1 | -2/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update :/abc ambiguity check | Nguyễn Thái Ngọc Duy | 2013-01-21 | 1 | -2/+15 |
* | | | | | | | | | | Merge branch 'tb/t0050-maint' | Junio C Hamano | 2013-01-28 | 1 | -35/+17 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | t0050: Use TAB for indentation | Torsten Bögershausen | 2013-01-21 | 1 | -33/+15 |
| * | | | | | | | | | t0050: honor CASE_INSENSITIVE_FS in add (with different case) | Torsten Bögershausen | 2013-01-21 | 1 | -1/+1 |
| * | | | | | | | | | t0050: known breakage vanished in merge (case change) | Torsten Bögershausen | 2013-01-21 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'for-junio' of git://bogomips.org/git-svn | Junio C Hamano | 2013-01-25 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-svn: Simplify calculation of GIT_DIR | Barry Wardell | 2013-01-24 | 1 | -0/+8 |
* | | | | | | | | | | | Merge branch 'nd/retire-fnmatch' | Junio C Hamano | 2013-01-25 | 1 | -0/+43 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | wildmatch: advance faster in <asterisk> + <literal> patterns | Nguyễn Thái Ngọc Duy | 2013-01-01 | 1 | -0/+8 |
| * | | | | | | | | | | | wildmatch: make a special case for "*/" with FNM_PATHNAME | Nguyễn Thái Ngọc Duy | 2013-01-01 | 1 | -0/+8 |
| * | | | | | | | | | | | wildmatch: support "no FNM_PATHNAME" mode | Nguyễn Thái Ngọc Duy | 2013-01-01 | 1 | -0/+27 |
* | | | | | | | | | | | | Merge branch 'as/pre-push-hook' | Junio C Hamano | 2013-01-23 | 1 | -0/+131 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | push: Add support for pre-push hooks | Aaron Schrab | 2013-01-18 | 1 | -0/+131 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'as/check-ignore' | Junio C Hamano | 2013-01-23 | 1 | -0/+637 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t0008: avoid brace expansion | René Scharfe | 2013-01-10 | 1 | -2/+7 |
| * | | | | | | | | | | | | add git-check-ignore sub-command | Adam Spiers | 2013-01-06 | 1 | -0/+632 |
* | | | | | | | | | | | | | Merge branch 'cr/push-force-tag-update' | Junio C Hamano | 2013-01-23 | 1 | -21/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | push: fix "refs/tags/ hierarchy cannot be updated without --force" | Junio C Hamano | 2013-01-16 | 1 | -21/+0 |
* | | | | | | | | | | | | | | Merge branch 'mo/cvs-server-updates' | Junio C Hamano | 2013-01-23 | 1 | -0/+551 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |