summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | test-lib: skip test with COLUMNS=1 under mkshZbigniew Jędrzejewski-Szmek2012-04-271-0/+1
| * | | | | | | | | | | | Prevent graph_width of stat width from falling below minLucian Poston2012-04-182-8/+12
| * | | | | | | | | | | | t4052: Test diff-stat output with minimum columnsLucian Poston2012-04-181-0/+28
| * | | | | | | | | | | | t4052: Adjust --graph --stat output for prefixesLucian Poston2012-04-161-9/+25
| * | | | | | | | | | | | Adjust stat width calculations to take --graph output into accountLucian Poston2012-04-161-1/+1
| * | | | | | | | | | | | Add output_prefix_length to diff_optionsLucian Poston2012-04-162-0/+4
| * | | | | | | | | | | | t4052: test --stat output with --graphZbigniew Jędrzejewski-Szmek2012-04-161-4/+74
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Start preparing for 1.7.10.2Junio C Hamano2012-05-072-1/+47
* | | | | | | | | | | | Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maintJunio C Hamano2012-05-073-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Consistently use perl from /usr/bin/ for scriptsZbigniew Jędrzejewski-Szmek2012-05-012-2/+2
| * | | | | | | | | | | | t/gitweb-lib: use $PERL_PATH to run gitwebJeff King2012-05-011-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/daemon-test-race-fix' into maintJunio C Hamano2012-05-071-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5570: fix forwarding of git-daemon messages via catJohannes Sixt2012-04-271-11/+11
* | | | | | | | | | | | | Merge branch 'jk/maint-config-bogus-section' into maintJunio C Hamano2012-05-072-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config: reject bogus section names for --rename-sectionJeff King2012-04-252-1/+31
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'pw/t5800-import-race-fix' into maintJunio C Hamano2012-05-072-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-remote-testgit: fix race when spawning fast-importPete Wyckoff2012-04-242-0/+20
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rt/cherry-revert-conflict-summary' into maintJunio C Hamano2012-05-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sequencer: remove additional blank lineRalf Thielow2012-04-191-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maintJunio C Hamano2012-05-071-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | properly keep track of current working directoryClemens Buchacher2012-04-151-9/+13
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | git p4 doc: fix formattingPete Wyckoff2012-05-071-1/+3
* | | | | | | | | | | | | Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-035-71/+276
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-182-10/+149
| * | | | | | | | | | | | | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-174-28/+43
| * | | | | | | | | | | | | builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-171-13/+27
| * | | | | | | | | | | | | builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-171-23/+28
| * | | | | | | | | | | | | merge tests: octopus with redundant parentsMichał Kiedrowicz2012-04-173-7/+39
* | | | | | | | | | | | | | Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano2012-05-033-11/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cherry-pick: do not expect file argumentsClemens Buchacher2012-04-153-11/+19
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'cb/http-multi-curl-auth' into maintJunio C Hamano2012-05-032-10/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | http: use newer curl options for setting credentialsJeff King2012-04-141-2/+11
| * | | | | | | | | | | | | | http: clean up leak in init_curl_http_authJeff King2012-04-141-3/+3
| * | | | | | | | | | | | | | fix http auth with multiple curl handlesJeff King2012-04-102-5/+7
| * | | | | | | | | | | | | | http auth fails with multiple curl handlesClemens Buchacher2012-04-101-10/+15
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-032-4/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fetch: describe new refs based on where it came fromMarc Branchaud2012-04-172-3/+41
| * | | | | | | | | | | | | | fetch: Give remote_ref to update_local_ref() as wellMarc Branchaud2012-04-171-1/+2
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'rl/maint-stash-i18n-save-error' into maintJunio C Hamano2012-05-031-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | stash: use eval_gettextln correctlyRoss Lagerwall2012-04-141-2/+2
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jm/maint-strncpy-diff-no-index' into maintJunio C Hamano2012-05-031-21/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diff --no-index: use strbuf for temporary pathnamesJunio C Hamano2012-04-261-23/+17
| * | | | | | | | | | | | | | diff: avoid stack-buffer-read-overrun for very long nameJim Meyering2012-04-161-0/+2
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Git 1.7.10.1v1.7.10.1Junio C Hamano2012-05-013-3/+32
* | | | | | | | | | | | | | Merge branch 'pw/fast-import-dataref-parsing' into maintJunio C Hamano2012-05-012-33/+364
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fast-import: tighten parsing of datarefsPete Wyckoff2012-04-102-33/+364
* | | | | | | | | | | | | | | Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-016-6/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | remote-curl: main test case for the OS command line overflowIvan Todoroski2012-04-101-0/+31
| * | | | | | | | | | | | | | | fetch-pack: test cases for the new --stdin optionIvan Todoroski2012-04-101-0/+66
| * | | | | | | | | | | | | | | remote-curl: send the refs to fetch-pack on stdinIvan Todoroski2012-04-101-5/+13