summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/clone-detached'Junio C Hamano2012-01-318-159/+254
|\
| * clone: fix up delay cloning conditionsNguyễn Thái Ngọc Duy2012-01-243-12/+15
| * push: do not let configured foreign-vcs permanently clobberedJunio C Hamano2012-01-231-0/+2
| * clone: print advice on checking out detached HEADNguyễn Thái Ngọc Duy2012-01-164-16/+20
| * clone: allow --branch to take a tagNguyễn Thái Ngọc Duy2012-01-164-3/+46
| * clone: refuse to clone if --branch points to bogus refNguyễn Thái Ngọc Duy2012-01-163-21/+6
| * clone: --branch=<branch> always means refs/heads/<branch>Nguyễn Thái Ngọc Duy2012-01-161-14/+16
| * clone: delay cloning until after remote HEAD checkingNguyễn Thái Ngọc Duy2012-01-162-28/+31
| * clone: factor out remote ref writingNguyễn Thái Ngọc Duy2012-01-161-14/+25
| * clone: factor out HEAD update codeNguyễn Thái Ngọc Duy2012-01-161-17/+24
| * clone: factor out checkout codeNguyễn Thái Ngọc Duy2012-01-161-43/+58
| * clone: write detached HEAD in bare repositoriesNguyễn Thái Ngọc Duy2012-01-162-7/+27
| * t5601: add missing && cascadeNguyễn Thái Ngọc Duy2012-01-161-3/+3
* | Merge branch 'da/maint-mergetool-twoway'Junio C Hamano2012-01-312-5/+35
|\ \
| * | mergetool: Provide an empty file when neededda/maint-mergetool-twowayDavid Aguilar2012-01-232-5/+35
* | | Merge branch 'va/git-p4-branch'Junio C Hamano2012-01-312-9/+133
|\ \ \
| * | | t9801: do not overuse test_must_failva/git-p4-branchJunio C Hamano2012-01-261-4/+4
| * | | git-p4: Change p4 command invocationPete Wyckoff2012-01-261-1/+1
| * | | git-p4: Add test case for complex branch importVitor Antunes2012-01-261-7/+87
| * | | git-p4: Search for parent commit on branch creationVitor Antunes2012-01-261-1/+45
* | | | Merge branch 'jl/submodule-re-add'Junio C Hamano2012-01-312-0/+9
|\ \ \ \
| * | | | submodule add: fix breakage when re-adding a deep submodulejl/submodule-re-addJens Lehmann2012-01-242-0/+9
* | | | | Merge branch 'tr/grep-l-with-decoration'Junio C Hamano2012-01-312-2/+25
|\ \ \ \ \
| * | | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-232-2/+25
* | | | | | Merge branch 'ks/sort-wildcard-in-makefile'Junio C Hamano2012-01-311-3/+3
|\ \ \ \ \ \
| * | | | | | t/Makefile: Use $(sort ...) explicitly where neededks/sort-wildcard-in-makefileKirill Smelkov2012-01-221-3/+3
* | | | | | | Merge branch 'ld/git-p4-branches-and-labels'Junio C Hamano2012-01-313-35/+205
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | git-p4: label import fails with multiple labels at the same changelistld/git-p4-branches-and-labelsLuke Diamand2012-01-201-0/+41
| * | | | | | git-p4: add test for p4 labelsLuke Diamand2012-01-201-0/+72
| * | | | | | git-p4: importing labels should cope with missing ownerLuke Diamand2012-01-201-28/+35
| * | | | | | git-p4: cope with labels with empty descriptionsLuke Diamand2012-01-201-3/+5
| * | | | | | git-p4: handle p4 branches and labels containing shell charsLuke Diamand2012-01-202-4/+52
* | | | | | | Merge branch 'rr/sequencer'Junio C Hamano2012-01-313-947/+960
|\ \ \ \ \ \ \
| * | | | | | | sequencer: factor code out of revert builtinrr/sequencerRamkumar Ramachandra2012-01-113-947/+956
| * | | | | | | revert: prepare to move replay_action to headerRamkumar Ramachandra2012-01-111-18/+22
* | | | | | | | Merge branch 'jc/advise-i18n'Junio C Hamano2012-01-312-12/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n of multi-line advice messagesjc/advise-i18nJunio C Hamano2011-12-222-12/+20
* | | | | | | | | completion: --edit and --no-edit for git-mergeAdrian Weimann2012-01-301-1/+1
* | | | | | | | | Kick off the post 1.7.9 cycleJunio C Hamano2012-01-293-2/+71
* | | | | | | | | Merge branch 'nd/index-pack-no-recurse'Junio C Hamano2012-01-293-68/+154
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: eliminate unlimited recursion in get_base_data()Nguyễn Thái Ngọc Duy2012-01-161-9/+44
| * | | | | | | | | index-pack: eliminate recursion in find_unresolved_deltasNguyễn Thái Ngọc Duy2012-01-161-41/+70
| * | | | | | | | | Eliminate recursion in setting/clearing marks in commit listNguyễn Thái Ngọc Duy2012-01-162-18/+40
* | | | | | | | | | Merge branch 'rs/diff-postimage-in-context'Junio C Hamano2012-01-292-13/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | xdiff: print post-image for common records instead of pre-imagers/diff-postimage-in-contextRené Scharfe2012-01-062-13/+13
* | | | | | | | | | | Merge branch 'jk/parse-object-cached'Junio C Hamano2012-01-294-6/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | upload-pack: avoid parsing tag destinationsjk/parse-object-cachedJeff King2012-01-063-2/+14
| * | | | | | | | | | | upload-pack: avoid parsing objects during ref advertisementJeff King2012-01-061-3/+7
| * | | | | | | | | | | parse_object: try internal cache before reading object dbJeff King2012-01-051-2/+7
* | | | | | | | | | | | Merge branch 'sp/smart-http-failure-to-push'Junio C Hamano2012-01-292-4/+33
|\ \ \ \ \ \ \ \ \ \ \ \