summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | fast-import doc: cat-blob and ls responses need to be consumed quicklyJonathan Nieder2012-04-151-3/+39
| |/ / /
* | | | Merge branch 'jn/more-i18ncmp'Junio C Hamano2012-04-233-8/+8
|\ \ \ \
| * | | | test: am of empty patch should not succeedJonathan Nieder2012-04-151-1/+1
| * | | | test: use test_i18ncmp for "Patch format detection failed" messageJonathan Nieder2012-04-151-1/+1
| * | | | test: do not rely on US English tracking-info messagesJonathan Nieder2012-04-152-6/+6
* | | | | Merge branch 'jl/maint-submodule-recurse-fetch'Junio C Hamano2012-04-231-3/+3
|\ \ \ \ \
| * | | | | submodules: recursive fetch also checks new tags for submodule commitsJens Lehmann2012-04-151-3/+3
* | | | | | Merge branch 'jc/maint-blame-minimal'Junio C Hamano2012-04-231-0/+1
|\ \ \ \ \ \
| * | | | | | blame: accept --need-minimalJunio C Hamano2012-04-111-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'lp/maint-diff-three-dash-with-graph'Junio C Hamano2012-04-233-2/+299
|\ \ \ \ \ \
| * | | | | | t4202: add test for "log --graph --stat -p" separator linesLucian Poston2012-03-201-0/+290
| * | | | | | log --graph: fix break in graph linesLucian Poston2012-03-201-0/+6
| * | | | | | log --graph --stat: three-dash separator should come after graph linesLucian Poston2012-03-201-2/+3
* | | | | | | Merge branch 'rs/commit-list-sort-in-batch'Junio C Hamano2012-04-238-7/+188
|\ \ \ \ \ \ \
| * | | | | | | mergesort: rename it to llist_mergesort()Junio C Hamano2012-04-174-11/+19
| * | | | | | | revision: insert unsorted, then sort in prepare_revision_walk()René Scharfe2012-04-113-1/+19
| * | | | | | | commit: use mergesort() in commit_list_sort_by_date()René Scharfe2012-04-111-6/+23
| * | | | | | | add mergesort() for linked listsRené Scharfe2012-04-115-0/+138
* | | | | | | | Merge branch 'jh/apply-free-patch'Junio C Hamano2012-04-231-41/+133
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: document buffer ownership rules across functionsJunio C Hamano2012-04-111-2/+51
| * | | | | | | | apply: tighten constness of line bufferJunio C Hamano2012-04-111-7/+7
| * | | | | | | | apply: drop unused macroJunio C Hamano2012-04-111-1/+0
| * | | | | | | | apply: free unused fragments for submodule patchJunio C Hamano2012-03-291-9/+15
| * | | | | | | | apply: free patch->resultJunio C Hamano2012-03-281-0/+1
| * | | | | | | | apply: release memory for fn_tableJunio C Hamano2012-03-281-1/+1
| * | | | | | | | apply: free patch->{def,old,new}_name fieldsJunio C Hamano2012-03-281-26/+39
| * | | | | | | | apply: rename free_patch() to free_patch_list()Junio C Hamano2012-03-281-14/+19
| * | | | | | | | apply: do not leak patches and fragmentsJared Hance2012-03-071-4/+23
* | | | | | | | | Merge branch 'sl/test-wc-l-line-count'Junio C Hamano2012-04-2319-74/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-1119-74/+65
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jn/debian-customizes-default-editor'Junio C Hamano2012-04-233-2/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settingsJonathan Nieder2012-04-103-0/+18
| * | | | | | | | | var doc: default editor and pager are configurable at build timeJonathan Nieder2012-03-311-2/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rl/show-empty-prefix'Junio C Hamano2012-04-232-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rev-parse --show-prefix: add in trailing newlineRoss Lagerwall2012-04-102-1/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pw/git-p4'Junio C Hamano2012-04-2320-205/+213
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git p4: use "git p4" directly in testsPete Wyckoff2012-04-1012-184/+182
| * | | | | | | | | git p4: update name in scriptPete Wyckoff2012-04-091-7/+7
| * | | | | | | | | git-p4: move to toplevelPete Wyckoff2012-04-099-15/+25
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ms/remote-usage-string'Junio C Hamano2012-04-231-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote: update builtin usageMichael Schubert2012-04-101-2/+2
* | | | | | | | | | Merge branch 'jk/rebase-i-submodule-conflict-only'Junio C Hamano2012-04-232-1/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-102-1/+31
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | RelNotes: the third batchJunio C Hamano2012-04-211-1/+27
* | | | | | | | | | Merge branch 'js/spawn-via-shell-path-fix'Junio C Hamano2012-04-211-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not use SHELL_PATH from build system in prepare_shell_cmd on WindowsJohannes Sixt2012-04-171-0/+4
* | | | | | | | | | | Merge branch 'ct/advise-push-default'Junio C Hamano2012-04-2110-13/+99
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix httpd tests that broke when non-ff push advice changedChristopher Tiwald2012-04-122-2/+2
| * | | | | | | | | | | clean up struct ref's nonfastforward fieldJeff King2012-03-262-4/+3
| * | | | | | | | | | | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-207-12/+99