Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/clone-detached' | Junio C Hamano | 2012-01-31 | 8 | -159/+254 |
|\ | |||||
| * | clone: fix up delay cloning conditions | Nguyễn Thái Ngọc Duy | 2012-01-24 | 3 | -12/+15 |
| * | push: do not let configured foreign-vcs permanently clobbered | Junio C Hamano | 2012-01-23 | 1 | -0/+2 |
| * | clone: print advice on checking out detached HEAD | Nguyễn Thái Ngọc Duy | 2012-01-16 | 4 | -16/+20 |
| * | clone: allow --branch to take a tag | Nguyễn Thái Ngọc Duy | 2012-01-16 | 4 | -3/+46 |
| * | clone: refuse to clone if --branch points to bogus ref | Nguyễn Thái Ngọc Duy | 2012-01-16 | 3 | -21/+6 |
| * | clone: --branch=<branch> always means refs/heads/<branch> | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -14/+16 |
| * | clone: delay cloning until after remote HEAD checking | Nguyễn Thái Ngọc Duy | 2012-01-16 | 2 | -28/+31 |
| * | clone: factor out remote ref writing | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -14/+25 |
| * | clone: factor out HEAD update code | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -17/+24 |
| * | clone: factor out checkout code | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -43/+58 |
| * | clone: write detached HEAD in bare repositories | Nguyễn Thái Ngọc Duy | 2012-01-16 | 2 | -7/+27 |
| * | t5601: add missing && cascade | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -3/+3 |
* | | Merge branch 'da/maint-mergetool-twoway' | Junio C Hamano | 2012-01-31 | 2 | -5/+35 |
|\ \ | |||||
| * | | mergetool: Provide an empty file when neededda/maint-mergetool-twoway | David Aguilar | 2012-01-23 | 2 | -5/+35 |
* | | | Merge branch 'va/git-p4-branch' | Junio C Hamano | 2012-01-31 | 2 | -9/+133 |
|\ \ \ | |||||
| * | | | t9801: do not overuse test_must_failva/git-p4-branch | Junio C Hamano | 2012-01-26 | 1 | -4/+4 |
| * | | | git-p4: Change p4 command invocation | Pete Wyckoff | 2012-01-26 | 1 | -1/+1 |
| * | | | git-p4: Add test case for complex branch import | Vitor Antunes | 2012-01-26 | 1 | -7/+87 |
| * | | | git-p4: Search for parent commit on branch creation | Vitor Antunes | 2012-01-26 | 1 | -1/+45 |
* | | | | Merge branch 'jl/submodule-re-add' | Junio C Hamano | 2012-01-31 | 2 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | submodule add: fix breakage when re-adding a deep submodulejl/submodule-re-add | Jens Lehmann | 2012-01-24 | 2 | -0/+9 |
* | | | | | Merge branch 'tr/grep-l-with-decoration' | Junio C Hamano | 2012-01-31 | 2 | -2/+25 |
|\ \ \ \ \ | |||||
| * | | | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decoration | Albert Yale | 2012-01-23 | 2 | -2/+25 |
* | | | | | | Merge branch 'ks/sort-wildcard-in-makefile' | Junio C Hamano | 2012-01-31 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | 3 | -35/+205 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | 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: importing labels should cope with missing owner | Luke Diamand | 2012-01-20 | 1 | -28/+35 |
| * | | | | | | git-p4: cope with labels with empty descriptions | Luke Diamand | 2012-01-20 | 1 | -3/+5 |
| * | | | | | | git-p4: handle p4 branches and labels containing shell chars | Luke Diamand | 2012-01-20 | 2 | -4/+52 |
* | | | | | | | Merge branch 'rr/sequencer' | Junio C Hamano | 2012-01-31 | 3 | -947/+960 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sequencer: factor code out of revert builtinrr/sequencer | Ramkumar Ramachandra | 2012-01-11 | 3 | -947/+956 |
| * | | | | | | | revert: prepare to move replay_action to header | Ramkumar Ramachandra | 2012-01-11 | 1 | -18/+22 |
* | | | | | | | | Merge branch 'jc/advise-i18n' | Junio C Hamano | 2012-01-31 | 2 | -12/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n of multi-line advice messagesjc/advise-i18n | Junio C Hamano | 2011-12-22 | 2 | -12/+20 |
* | | | | | | | | | completion: --edit and --no-edit for git-merge | Adrian Weimann | 2012-01-30 | 1 | -1/+1 |
* | | | | | | | | | Kick off the post 1.7.9 cycle | Junio C Hamano | 2012-01-29 | 3 | -2/+71 |
* | | | | | | | | | Merge branch 'nd/index-pack-no-recurse' | Junio C Hamano | 2012-01-29 | 3 | -68/+154 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | index-pack: eliminate unlimited recursion in get_base_data() | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -9/+44 |
| * | | | | | | | | | index-pack: eliminate recursion in find_unresolved_deltas | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -41/+70 |
| * | | | | | | | | | Eliminate recursion in setting/clearing marks in commit list | Nguyễn Thái Ngọc Duy | 2012-01-16 | 2 | -18/+40 |
* | | | | | | | | | | Merge branch 'rs/diff-postimage-in-context' | Junio C Hamano | 2012-01-29 | 2 | -13/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | xdiff: print post-image for common records instead of pre-imagers/diff-postimage-in-context | René Scharfe | 2012-01-06 | 2 | -13/+13 |
* | | | | | | | | | | | Merge branch 'jk/parse-object-cached' | Junio C Hamano | 2012-01-29 | 4 | -6/+27 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | upload-pack: avoid parsing tag destinationsjk/parse-object-cached | Jeff King | 2012-01-06 | 3 | -2/+14 |
| * | | | | | | | | | | | upload-pack: avoid parsing objects during ref advertisement | Jeff King | 2012-01-06 | 1 | -3/+7 |
| * | | | | | | | | | | | parse_object: try internal cache before reading object db | Jeff King | 2012-01-05 | 1 | -2/+7 |
* | | | | | | | | | | | | Merge branch 'sp/smart-http-failure-to-push' | Junio C Hamano | 2012-01-29 | 2 | -4/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ |