Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/index-pack-error-message' | Junio C Hamano | 2014-03-25 | 1 | -2/+2 |
|\ | |||||
| * | index-pack: report error using the correct variablend/index-pack-error-message | Junio C Hamano | 2014-03-17 | 1 | -2/+2 |
* | | Merge branch 'jk/lib-terminal-lazy' | Junio C Hamano | 2014-03-25 | 1 | -18/+19 |
|\ \ | |||||
| * | | t/lib-terminal: make TTY a lazy prerequisitejk/lib-terminal-lazy | Jeff King | 2014-03-14 | 1 | -18/+19 |
| |/ | |||||
* | | Merge branch 'dm/configure-iconv-locale-charset' | Junio C Hamano | 2014-03-25 | 1 | -1/+1 |
|\ \ | |||||
| * | | configure.ac: link with -liconv for locale_charset()dm/configure-iconv-locale-charset | Dmitry Marakasov | 2014-03-11 | 1 | -1/+1 |
* | | | Merge branch 'nd/commit-editor-cleanup' | Junio C Hamano | 2014-03-25 | 5 | -12/+48 |
|\ \ \ | |||||
| * | | | commit: add --cleanup=scissorsnd/commit-editor-cleanup | Nguyễn Thái Ngọc Duy | 2014-02-25 | 3 | -4/+34 |
| * | | | wt-status.c: move cut-line print code out to wt_status_add_cut_line | Nguyễn Thái Ngọc Duy | 2014-02-18 | 2 | -7/+13 |
| * | | | wt-status.c: make cut_line[] const to shrink .data section a bit | Nguyễn Thái Ngọc Duy | 2014-02-18 | 1 | -1/+1 |
* | | | | Merge branch 'jk/warn-on-object-refname-ambiguity' | Junio C Hamano | 2014-03-25 | 2 | -6/+15 |
|\ \ \ \ | |||||
| * | | | | rev-list: disable object/refname ambiguity check with --stdinjk/warn-on-object-refname-ambiguity | Jeff King | 2014-03-13 | 1 | -0/+6 |
| * | | | | cat-file: restore warn_on_object_refname_ambiguity flag | Jeff King | 2014-03-13 | 1 | -0/+3 |
| * | | | | cat-file: fix a minor memory leak in batch_objects | Jeff King | 2014-01-07 | 1 | -0/+1 |
| * | | | | cat-file: refactor error handling of batch_objects | Jeff King | 2014-01-07 | 1 | -6/+5 |
* | | | | | Merge branch 'mh/remove-subtree-long-pathname-fix' | Junio C Hamano | 2014-03-25 | 1 | -32/+32 |
|\ \ \ \ \ | |||||
| * | | | | | entry.c: fix possible buffer overflow in remove_subtree()mh/remove-subtree-long-pathname-fix | Michael Haggerty | 2014-03-13 | 1 | -17/+17 |
| * | | | | | checkout_entry(): use the strbuf throughout the function | Michael Haggerty | 2014-03-13 | 1 | -16/+16 |
* | | | | | | Merge branch 'nd/indent-fix-connect-c' | Junio C Hamano | 2014-03-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | connect.c: SP after "}", not TABnd/indent-fix-connect-c | Nguyễn Thái Ngọc Duy | 2014-03-13 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/mv-submodules-fix' | Junio C Hamano | 2014-03-25 | 2 | -1/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fix | brian m. carlson | 2014-03-17 | 2 | -1/+17 |
| * | | | | | | | builtin/mv: fix out of bounds write | John Keeping | 2014-03-11 | 1 | -0/+4 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'cp/am-patch-format-doc' | Junio C Hamano | 2014-03-25 | 1 | -1/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/git-am: typofixcp/am-patch-format-doc | Chris Packham | 2014-03-17 | 1 | -1/+1 |
| * | | | | | | | Documentation/git-am: Document supported --patch-format options | Chris Packham | 2014-03-11 | 1 | -3/+9 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-03-21 | 1 | -2/+26 |
* | | | | | | | Merge branch 'lt/request-pull' | Junio C Hamano | 2014-03-21 | 3 | -83/+126 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | request-pull: documentation updates | Junio C Hamano | 2014-03-13 | 1 | -6/+49 |
| * | | | | | | | request-pull: resurrect "pretty refname" feature | Junio C Hamano | 2014-02-25 | 2 | -2/+10 |
| * | | | | | | | request-pull: test updates | Junio C Hamano | 2014-02-25 | 1 | -8/+8 |
| * | | | | | | | request-pull: pick up tag message as before | Junio C Hamano | 2014-02-25 | 1 | -0/+8 |
| * | | | | | | | request-pull: allow "local:remote" to specify names on both ends | Linus Torvalds | 2014-02-25 | 1 | -21/+29 |
| * | | | | | | | request-pull: more strictly match local/remote branches | Linus Torvalds | 2014-02-25 | 1 | -67/+43 |
* | | | | | | | | Merge branch 'es/sh-i18n-envsubst' | Junio C Hamano | 2014-03-21 | 1 | -12/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | sh-i18n--envsubst: retire unused string_list_member()es/sh-i18n-envsubst | Eric Sunshine | 2014-03-12 | 1 | -12/+0 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/upload-pack-shallow' | Junio C Hamano | 2014-03-21 | 4 | -3/+65 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | upload-pack: send shallow info over stdin to pack-objectsnd/upload-pack-shallow | Nguyễn Thái Ngọc Duy | 2014-03-11 | 4 | -9/+37 |
* | | | | | | | | | Merge branch 'jn/wt-status' | Junio C Hamano | 2014-03-21 | 3 | -55/+88 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | wt-status: lift the artificual "at least 20 columns" floorjn/wt-status | Junio C Hamano | 2014-03-12 | 3 | -15/+13 |
| * | | | | | | | | | wt-status: i18n of section labels | Jonathan Nieder | 2014-03-12 | 1 | -19/+47 |
| * | | | | | | | | | wt-status: extract the code to compute width for labels | Jonathan Nieder | 2014-03-12 | 1 | -7/+15 |
| * | | | | | | | | | wt-status: make full label string to be subject to l10n | Junio C Hamano | 2014-03-12 | 1 | -18/+17 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/stash-pop-not-popped' | Junio C Hamano | 2014-03-21 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | stash pop: mention we did not drop the stash upon failing to applyjc/stash-pop-not-popped | Junio C Hamano | 2014-02-26 | 1 | -2/+8 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dk/skip-prefix-scan-only-once' | Junio C Hamano | 2014-03-21 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | skip_prefix(): scan prefix only oncedk/skip-prefix-scan-only-once | David Kastrup | 2014-03-03 | 1 | -2/+5 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'nd/tag-version-sort' | Junio C Hamano | 2014-03-21 | 6 | -5/+211 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tag: support --sort=<spec>nd/tag-version-sort | Nguyễn Thái Ngọc Duy | 2014-02-27 | 6 | -5/+211 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/shallow-update-fix' | Junio C Hamano | 2014-03-21 | 5 | -56/+49 |
|\ \ \ \ \ \ \ \ \ |