summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* cherry-pick: No advice to commit if --no-commitph/cherry-pick-advice-refinementPhil Hord2012-02-222-6/+25
* 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
|\ \ \ \ \ \
| * | | | | | remote-curl: Fix push status report when all branches failShawn O. Pearce2012-01-202-4/+33
* | | | | | | Merge branch 'jc/maint-log-first-parent-pathspec'Junio C Hamano2012-01-292-1/+10
|\ \ \ \ \ \ \
| * | | | | | | Making pathspec limited log play nicer with --first-parentjc/maint-log-first-parent-pathspecJunio C Hamano2012-01-192-1/+10
| |/ / / / / /
* | | | | | | Merge branch 'mh/ref-clone-without-extra-refs'Junio C Hamano2012-01-294-11/+40
|\ \ \ \ \ \ \
| * | | | | | | write_remote_refs(): create packed (rather than extra) refsmh/ref-clone-without-extra-refsMichael Haggerty2012-01-171-2/+1
| * | | | | | | add_packed_ref(): new function in the refs API.Michael Haggerty2012-01-172-0/+12
| * | | | | | | ref_array: keep track of whether references are sortedMichael Haggerty2012-01-171-7/+26
| * | | | | | | pack_refs(): remove redundant checkMichael Haggerty2012-01-171-2/+1
* | | | | | | | Merge branch 'jl/test-pause'Junio C Hamano2012-01-292-0/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | test-lib: add the test_pause convenience functionjl/test-pauseJens Lehmann2012-01-172-0/+26
* | | | | | | | | Merge branch 'tr/maint-mailinfo'Junio C Hamano2012-01-294-7/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mailinfo: with -b, keep space after [foo]tr/maint-mailinfoThomas Rast2012-01-162-2/+11
| * | | | | | | | | am: learn passing -b to mailinfoThomas Rast2012-01-163-6/+31
* | | | | | | | | | Merge branch 'pw/p4-view-updates'Junio C Hamano2012-01-294-7/+406
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: add tests demonstrating spec overlay ambiguitiespw/p4-view-updatesPete Wyckoff2012-01-112-0/+392
| * | | | | | | | | | git-p4: adjust test to adhere to stricter useClientSpecPete Wyckoff2012-01-111-2/+2
| * | | | | | | | | | git-p4: clarify commentPete Wyckoff2012-01-111-1/+2
| * | | | | | | | | | git-p4: fix verbose comment typoPete Wyckoff2012-01-111-1/+1
| * | | | | | | | | | git-p4: only a single ... wildcard is supportedPete Wyckoff2012-01-112-3/+9
* | | | | | | | | | | Merge branch 'nd/maint-refname-in-hierarchy-check'Junio C Hamano2012-01-293-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix incorrect ref namespace checknd/maint-refname-in-hierarchy-checkNguyễn Thái Ngọc Duy2012-01-113-4/+4
* | | | | | | | | | | | Merge branch 'jn/gitweb-unspecified-action'Junio C Hamano2012-01-292-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: Fix actionless dispatch for non-existent objectsjn/gitweb-unspecified-actionJakub Narebski2012-01-092-1/+11
* | | | | | | | | | | | | Merge branch 'cb/push-quiet'Junio C Hamano2012-01-298-19/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t5541: avoid TAP test miscountingcb/push-quietMichael J Gruber2012-01-081-1/+1
| * | | | | | | | | | | | | fix push --quiet: add 'quiet' capability to receive-packClemens Buchacher2012-01-085-6/+40
| * | | | | | | | | | | | | server_supports(): parse feature list more carefullyJunio C Hamano2012-01-084-13/+38
* | | | | | | | | | | | | | Merge branch 'nd/clone-single-branch'Junio C Hamano2012-01-293-6/+129
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | clone: add --single-branch to fetch only one branchnd/clone-single-branchNguyễn Thái Ngọc Duy2012-01-083-6/+129
* | | | | | | | | | | | | | | Merge branch 'cb/git-daemon-tests'Junio C Hamano2012-01-293-3/+220
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-daemon tests: wait until daemon is readycb/git-daemon-testsClemens Buchacher2012-01-081-1/+17