summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | rebase: refactor reading of stateMartin von Zweigbergk2011-02-101-30/+23
| * | | | | rebase: clearer names for directory variablesMartin von Zweigbergk2011-02-101-70/+71
* | | | | | Merge branch 'en/merge-recursive'Junio C Hamano2011-04-282-6/+81
|\ \ \ \ \ \
| * | | | | | merge-recursive: tweak magic band-aidJunio C Hamano2011-03-171-1/+8
| * | | | | | merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-03-022-7/+12
| * | | | | | t6022: New test checking for unnecessary updates of files in D/F conflictsElijah Newren2011-03-021-0/+33
| * | | | | | t6022: New test checking for unnecessary updates of renamed+modified filesElijah Newren2011-03-021-0/+30
* | | | | | | Merge branch 'jh/dirstat'Junio C Hamano2011-04-288-12/+81
|\ \ \ \ \ \ \
| * | | | | | | --dirstat: In case of renames, use target filename instead of source filenameJohan Herland2011-04-121-1/+1
| * | | | | | | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-114-5/+21
| * | | | | | | --dirstat-by-file: Make it faster and more correctJohan Herland2011-04-113-5/+25
| * | | | | | | --dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland2011-04-116-7/+40
* | | | | | | | Merge branch 'sp/maint-clear-postfields'Junio C Hamano2011-04-281-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | http: clear POSTFIELDS when initializing a slotJunio C Hamano2011-04-261-0/+1
* | | | | | | | | Start 1.7.6 cycleJunio C Hamano2011-04-273-2/+81
* | | | | | | | | Merge branch 'mg/x-years-12-months'Junio C Hamano2011-04-272-2/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | date: avoid "X years, 12 months" in relative datesMichael J Gruber2011-04-202-2/+4
* | | | | | | | | Merge branch 'cn/format-patch-quiet'Junio C Hamano2011-04-272-7/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: document --quiet optionCarlos Martín Nieto2011-04-121-1/+4
| * | | | | | | | | format-patch: don't pass on the --quiet flagCarlos Martín Nieto2011-04-121-6/+10
* | | | | | | | | | Merge branch 'ef/maint-strbuf-init'Junio C Hamano2011-04-273-12/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: support values longer than 1023 bytesErik Faye-Lund2011-04-112-11/+9
| * | | | | | | | | | strbuf: make sure buffer is zero-terminatedErik Faye-Lund2011-04-111-1/+3
* | | | | | | | | | | Merge branch 'rr/doc-content-type'Junio C Hamano2011-04-272-62/+103
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: Allow custom diff tools to be specified in 'diff.tool'Ramkumar Ramachandra2011-04-061-6/+8
| * | | | | | | | | | | Documentation: Add diff.<driver>.* to configRamkumar Ramachandra2011-04-061-0/+28
| * | | | | | | | | | | Documentation: Move diff.<driver>.* from config.txt to diff-config.txtRamkumar Ramachandra2011-04-062-62/+63
| * | | | | | | | | | | Documentation: Add filter.<driver>.* to configRamkumar Ramachandra2011-04-061-0/+10
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/merge-dash-previous'Junio C Hamano2011-04-271-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge: allow "-" as a short-hand for "previous branch"Junio C Hamano2011-04-071-3/+6
* | | | | | | | | | | | Merge branch 'dm/stash-k-i-p'Junio C Hamano2011-04-273-4/+25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | stash: ensure --no-keep-index and --patch can be used in any orderDan McGee2011-04-072-5/+6
| * | | | | | | | | | | | stash: add two more tests for --no-keep-indexDan McGee2011-04-072-0/+20
* | | | | | | | | | | | | Merge branch 'rj/sparse'Junio C Hamano2011-04-2710-30/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | sparse: Fix some "symbol not declared" warningsRamsay Jones2011-04-222-2/+3
| * | | | | | | | | | | | | sparse: Fix errors due to missing target-specific variablesRamsay Jones2011-04-221-17/+28
| * | | | | | | | | | | | | sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-114-2/+10
| * | | | | | | | | | | | | sparse: Fix an "symbol 'format_subject' not declared" warningRamsay Jones2011-04-112-3/+2
| * | | | | | | | | | | | | sparse: Fix some "Using plain integer as NULL pointer" warningsRamsay Jones2011-04-111-2/+2
| * | | | | | | | | | | | | sparse: Fix an "symbol 'cmd_index_pack' not declared" warningRamsay Jones2011-04-111-1/+1
| * | | | | | | | | | | | | Makefile: Use cgcc rather than sparse in the check targetRamsay Jones2011-04-111-5/+6
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/maint-upload-pack-shallow'Junio C Hamano2011-04-271-12/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | upload-pack: start pack-objects before async rev-listJeff King2011-04-061-12/+11
* | | | | | | | | | | | | | Merge branch 'nk/blame-abbrev'Junio C Hamano2011-04-272-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | blame: add --abbrev command line option and make it honor core.abbrevNamhyung Kim2011-04-052-2/+14
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/maint-stash-oob'Junio C Hamano2011-04-272-16/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | stash: fix false positive in the invalid ref test.Jon Seymour2011-04-051-5/+5
| * | | | | | | | | | | | | | stash: fix accidental apply of non-existent stashesJeff King2011-04-052-11/+7
* | | | | | | | | | | | | | | Merge branch 'dm/color-palette'Junio C Hamano2011-04-274-35/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Share color list between graph and show-branchDan McGee2011-04-044-35/+29