summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-281-9/+15
| * | apply: free patch->resultJunio C Hamano2012-03-271-0/+1
| * | apply: release memory for fn_tableJunio C Hamano2012-03-271-1/+1
| * | apply: free patch->{def,old,new}_name fieldsJunio C Hamano2012-03-271-26/+39
| * | apply: rename free_patch() to free_patch_list()Junio C Hamano2012-03-271-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-0912-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-091-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-092-1/+31
* | | | | | RelNotes: the third batchJunio C Hamano2012-04-201-1/+27
* | | | | | Merge branch 'js/spawn-via-shell-path-fix'Junio C Hamano2012-04-201-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-2010-13/+99
|\ \ \ \ \ \ \
| * | | | | | | Fix httpd tests that broke when non-ff push advice changedChristopher Tiwald2012-04-122-2/+2
| * | | | | | | clean up struct ref's nonfastforward fieldct/advise-push-defaultJeff King2012-03-262-4/+3
| * | | | | | | push: Provide situational hints for non-fast-forward errorsChristopher Tiwald2012-03-197-12/+99
* | | | | | | | Merge branch 'bw/submodule-sed-solaris'Junio C Hamano2012-04-201-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid bug in Solaris xpg4/sed as used in submoduleBen Walton2012-04-091-2/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/run-command-eacces'Junio C Hamano2012-04-206-7/+86
|\ \ \ \ \ \ \ \
| * | | | | | | | run-command: treat inaccessible directories as ENOENTJeff King2012-04-054-3/+80
| * | | | | | | | compat/mingw.[ch]: Change return type of exec functions to intRamsay Jones2012-04-052-4/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jc/push-upstream-sanity'Junio C Hamano2012-04-202-8/+72
|\ \ \ \ \ \ \ \
| * | | | | | | | push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-052-8/+72
* | | | | | | | | Merge branch 'jc/am-report-3way'Junio C Hamano2012-04-201-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | am -3: list the paths that needed 3-way fallbackJunio C Hamano2012-03-281-0/+6
* | | | | | | | | | Merge branch 'jb/am-include'Junio C Hamano2012-04-202-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | am: support --include optionJohannes Berg2012-03-282-2/+4
* | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-04-202-7/+134
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-peopleJunio C Hamano2012-03-132-7/+134