Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/commit-list-sort-in-batch' | Junio C Hamano | 2012-04-23 | 8 | -7/+188 |
|\ | |||||
| * | mergesort: rename it to llist_mergesort() | Junio C Hamano | 2012-04-17 | 4 | -11/+19 |
| * | revision: insert unsorted, then sort in prepare_revision_walk() | René Scharfe | 2012-04-11 | 3 | -1/+19 |
| * | commit: use mergesort() in commit_list_sort_by_date() | René Scharfe | 2012-04-11 | 1 | -6/+23 |
| * | add mergesort() for linked lists | René Scharfe | 2012-04-11 | 5 | -0/+138 |
* | | Merge branch 'jh/apply-free-patch' | Junio C Hamano | 2012-04-23 | 1 | -41/+133 |
|\ \ | |||||
| * | | apply: document buffer ownership rules across functions | Junio C Hamano | 2012-04-11 | 1 | -2/+51 |
| * | | apply: tighten constness of line buffer | Junio C Hamano | 2012-04-11 | 1 | -7/+7 |
| * | | apply: drop unused macro | Junio C Hamano | 2012-04-11 | 1 | -1/+0 |
| * | | apply: free unused fragments for submodule patch | Junio C Hamano | 2012-03-28 | 1 | -9/+15 |
| * | | apply: free patch->result | Junio C Hamano | 2012-03-27 | 1 | -0/+1 |
| * | | apply: release memory for fn_table | Junio C Hamano | 2012-03-27 | 1 | -1/+1 |
| * | | apply: free patch->{def,old,new}_name fields | Junio C Hamano | 2012-03-27 | 1 | -26/+39 |
| * | | apply: rename free_patch() to free_patch_list() | Junio C Hamano | 2012-03-27 | 1 | -14/+19 |
| * | | apply: do not leak patches and fragments | Jared Hance | 2012-03-07 | 1 | -4/+23 |
* | | | Merge branch 'sl/test-wc-l-line-count' | Junio C Hamano | 2012-04-23 | 19 | -74/+65 |
|\ \ \ | |||||
| * | | | tests: modernise style: more uses of test_line_count | Stefano Lattarini | 2012-04-11 | 19 | -74/+65 |
* | | | | Merge branch 'jn/debian-customizes-default-editor' | Junio C Hamano | 2012-04-23 | 3 | -2/+22 |
|\ \ \ \ | |||||
| * | | | | var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings | Jonathan Nieder | 2012-04-10 | 3 | -0/+18 |
| * | | | | var doc: default editor and pager are configurable at build time | Jonathan Nieder | 2012-03-31 | 1 | -2/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'rl/show-empty-prefix' | Junio C Hamano | 2012-04-23 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | rev-parse --show-prefix: add in trailing newline | Ross Lagerwall | 2012-04-10 | 2 | -1/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'pw/git-p4' | Junio C Hamano | 2012-04-23 | 20 | -205/+213 |
|\ \ \ \ | |||||
| * | | | | git p4: use "git p4" directly in tests | Pete Wyckoff | 2012-04-09 | 12 | -184/+182 |
| * | | | | git p4: update name in script | Pete Wyckoff | 2012-04-09 | 1 | -7/+7 |
| * | | | | git-p4: move to toplevel | Pete Wyckoff | 2012-04-09 | 9 | -15/+25 |
| |/ / / | |||||
* | | | | Merge branch 'ms/remote-usage-string' | Junio C Hamano | 2012-04-23 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | remote: update builtin usage | Michael Schubert | 2012-04-09 | 1 | -2/+2 |
* | | | | | Merge branch 'jk/rebase-i-submodule-conflict-only' | Junio C Hamano | 2012-04-23 | 2 | -1/+31 |
|\ \ \ \ \ | |||||
| * | | | | | rebase -i continue: don't skip commits that only change submodules | John Keeping | 2012-04-09 | 2 | -1/+31 |
* | | | | | | RelNotes: the third batch | Junio C Hamano | 2012-04-20 | 1 | -1/+27 |
* | | | | | | Merge branch 'js/spawn-via-shell-path-fix' | Junio C Hamano | 2012-04-20 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows | Johannes Sixt | 2012-04-17 | 1 | -0/+4 |
* | | | | | | | Merge branch 'ct/advise-push-default' | Junio C Hamano | 2012-04-20 | 10 | -13/+99 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix httpd tests that broke when non-ff push advice changed | Christopher Tiwald | 2012-04-12 | 2 | -2/+2 |
| * | | | | | | | clean up struct ref's nonfastforward fieldct/advise-push-default | Jeff King | 2012-03-26 | 2 | -4/+3 |
| * | | | | | | | push: Provide situational hints for non-fast-forward errors | Christopher Tiwald | 2012-03-19 | 7 | -12/+99 |
* | | | | | | | | Merge branch 'bw/submodule-sed-solaris' | Junio C Hamano | 2012-04-20 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Avoid bug in Solaris xpg4/sed as used in submodule | Ben Walton | 2012-04-09 | 1 | -2/+3 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/run-command-eacces' | Junio C Hamano | 2012-04-20 | 6 | -7/+86 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | run-command: treat inaccessible directories as ENOENT | Jeff King | 2012-04-05 | 4 | -3/+80 |
| * | | | | | | | | compat/mingw.[ch]: Change return type of exec functions to int | Ramsay Jones | 2012-04-05 | 2 | -4/+6 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/push-upstream-sanity' | Junio C Hamano | 2012-04-20 | 2 | -8/+72 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | push: error out when the "upstream" semantics does not make sense | Junio C Hamano | 2012-04-05 | 2 | -8/+72 |
* | | | | | | | | | Merge branch 'jc/am-report-3way' | Junio C Hamano | 2012-04-20 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | am -3: list the paths that needed 3-way fallback | Junio C Hamano | 2012-03-28 | 1 | -0/+6 |
* | | | | | | | | | | Merge branch 'jb/am-include' | Junio C Hamano | 2012-04-20 | 2 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | am: support --include option | Johannes Berg | 2012-03-28 | 2 | -2/+4 |
* | | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people' | Junio C Hamano | 2012-04-20 | 2 | -7/+134 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-people | Junio C Hamano | 2012-03-13 | 2 | -7/+134 |