summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/index-pack-error-message'Junio C Hamano2014-03-251-2/+2
|\
| * index-pack: report error using the correct variablend/index-pack-error-messageJunio C Hamano2014-03-171-2/+2
* | Merge branch 'jk/lib-terminal-lazy'Junio C Hamano2014-03-251-18/+19
|\ \
| * | t/lib-terminal: make TTY a lazy prerequisitejk/lib-terminal-lazyJeff King2014-03-141-18/+19
| |/
* | Merge branch 'dm/configure-iconv-locale-charset'Junio C Hamano2014-03-251-1/+1
|\ \
| * | configure.ac: link with -liconv for locale_charset()dm/configure-iconv-locale-charsetDmitry Marakasov2014-03-111-1/+1
* | | Merge branch 'nd/commit-editor-cleanup'Junio C Hamano2014-03-255-12/+48
|\ \ \
| * | | commit: add --cleanup=scissorsnd/commit-editor-cleanupNguyễn Thái Ngọc Duy2014-02-253-4/+34
| * | | wt-status.c: move cut-line print code out to wt_status_add_cut_lineNguyễn Thái Ngọc Duy2014-02-182-7/+13
| * | | wt-status.c: make cut_line[] const to shrink .data section a bitNguyễn Thái Ngọc Duy2014-02-181-1/+1
* | | | Merge branch 'jk/warn-on-object-refname-ambiguity'Junio C Hamano2014-03-252-6/+15
|\ \ \ \
| * | | | rev-list: disable object/refname ambiguity check with --stdinjk/warn-on-object-refname-ambiguityJeff King2014-03-131-0/+6
| * | | | cat-file: restore warn_on_object_refname_ambiguity flagJeff King2014-03-131-0/+3
| * | | | cat-file: fix a minor memory leak in batch_objectsJeff King2014-01-071-0/+1
| * | | | cat-file: refactor error handling of batch_objectsJeff King2014-01-071-6/+5
* | | | | Merge branch 'mh/remove-subtree-long-pathname-fix'Junio C Hamano2014-03-251-32/+32
|\ \ \ \ \
| * | | | | entry.c: fix possible buffer overflow in remove_subtree()mh/remove-subtree-long-pathname-fixMichael Haggerty2014-03-131-17/+17
| * | | | | checkout_entry(): use the strbuf throughout the functionMichael Haggerty2014-03-131-16/+16
* | | | | | Merge branch 'nd/indent-fix-connect-c'Junio C Hamano2014-03-251-1/+1
|\ \ \ \ \ \
| * | | | | | connect.c: SP after "}", not TABnd/indent-fix-connect-cNguyễn Thái Ngọc Duy2014-03-131-1/+1
* | | | | | | Merge branch 'jk/mv-submodules-fix'Junio C Hamano2014-03-252-1/+21
|\ \ \ \ \ \ \
| * | | | | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fixbrian m. carlson2014-03-172-1/+17
| * | | | | | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-111-0/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'cp/am-patch-format-doc'Junio C Hamano2014-03-251-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-am: typofixcp/am-patch-format-docChris Packham2014-03-171-1/+1
| * | | | | | | Documentation/git-am: Document supported --patch-format optionsChris Packham2014-03-111-3/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update draft release notes to 2.0Junio C Hamano2014-03-211-2/+26
* | | | | | | Merge branch 'lt/request-pull'Junio C Hamano2014-03-213-83/+126
|\ \ \ \ \ \ \
| * | | | | | | request-pull: documentation updatesJunio C Hamano2014-03-131-6/+49
| * | | | | | | request-pull: resurrect "pretty refname" featureJunio C Hamano2014-02-252-2/+10
| * | | | | | | request-pull: test updatesJunio C Hamano2014-02-251-8/+8
| * | | | | | | request-pull: pick up tag message as beforeJunio C Hamano2014-02-251-0/+8
| * | | | | | | request-pull: allow "local:remote" to specify names on both endsLinus Torvalds2014-02-251-21/+29
| * | | | | | | request-pull: more strictly match local/remote branchesLinus Torvalds2014-02-251-67/+43
* | | | | | | | Merge branch 'es/sh-i18n-envsubst'Junio C Hamano2014-03-211-12/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | sh-i18n--envsubst: retire unused string_list_member()es/sh-i18n-envsubstEric Sunshine2014-03-121-12/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/upload-pack-shallow'Junio C Hamano2014-03-214-3/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | upload-pack: send shallow info over stdin to pack-objectsnd/upload-pack-shallowNguyễn Thái Ngọc Duy2014-03-114-9/+37
* | | | | | | | | Merge branch 'jn/wt-status'Junio C Hamano2014-03-213-55/+88
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wt-status: lift the artificual "at least 20 columns" floorjn/wt-statusJunio C Hamano2014-03-123-15/+13
| * | | | | | | | | wt-status: i18n of section labelsJonathan Nieder2014-03-121-19/+47
| * | | | | | | | | wt-status: extract the code to compute width for labelsJonathan Nieder2014-03-121-7/+15
| * | | | | | | | | wt-status: make full label string to be subject to l10nJunio C Hamano2014-03-121-18/+17
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/stash-pop-not-popped'Junio C Hamano2014-03-211-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | stash pop: mention we did not drop the stash upon failing to applyjc/stash-pop-not-poppedJunio C Hamano2014-02-261-2/+8
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dk/skip-prefix-scan-only-once'Junio C Hamano2014-03-211-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | skip_prefix(): scan prefix only oncedk/skip-prefix-scan-only-onceDavid Kastrup2014-03-031-2/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/tag-version-sort'Junio C Hamano2014-03-216-5/+211
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tag: support --sort=<spec>nd/tag-version-sortNguyễn Thái Ngọc Duy2014-02-276-5/+211
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/shallow-update-fix'Junio C Hamano2014-03-215-56/+49
|\ \ \ \ \ \ \ \ \