summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* transport: compute summary-width dynamicallyjc/abbrev-autoJunio C Hamano2016-10-221-1/+17
* transport: allow summary-width to be computed dynamicallyJunio C Hamano2016-10-213-4/+9
* fetch: pass summary_width down the callchainJunio C Hamano2016-10-211-16/+21
* transport: pass summary_width down the callchainJunio C Hamano2016-10-211-25/+38
* find_unique_abbrev: move logic out of get_short_sha1()jk/abbrev-autoJeff King2016-10-033-26/+68
* abbrev: auto size the default abbreviationlt/abbrev-autoLinus Torvalds2016-10-033-2/+29
* abbrev: prepare for new world orderJunio C Hamano2016-10-032-3/+4
* abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizingJunio C Hamano2016-10-034-3/+8
* get_short_sha1: make default disambiguation configurableJeff King2016-09-274-0/+51
* get_short_sha1: list ambiguous objects on errorJeff King2016-09-262-2/+72
* for_each_abbrev: drop duplicate objectsJeff King2016-09-262-4/+22
* sha1_array: let callbacks interrupt iterationJeff King2016-09-267-12/+24
* get_short_sha1: mark ambiguity error for translationJeff King2016-09-261-1/+1
* get_short_sha1: NUL-terminate hex prefixJeff King2016-09-261-3/+3
* get_short_sha1: refactor init of disambiguation codeJeff King2016-09-261-44/+35
* get_short_sha1: parse tags when looking for treeishJeff King2016-09-262-1/+8
* get_sha1: propagate flags to child functionsJeff King2016-09-262-7/+25
* get_sha1: avoid repeating ourselves via ONLY_TO_DIEJeff King2016-09-262-0/+9
* get_sha1: detect buggy calls with multiple disambiguatorsJeff King2016-09-262-0/+9
* Fourth batch for 2.11Junio C Hamano2016-09-211-15/+86
* Merge branch 'jk/reduce-gc-aggressive-depth'Junio C Hamano2016-09-212-2/+2
|\
| * gc: default aggressive depth to 50jk/reduce-gc-aggressive-depthJeff King2016-08-112-2/+2
* | Merge branch 'jk/rebase-i-drop-ident-check'Junio C Hamano2016-09-212-3/+47
|\ \
| * | rebase-interactive: drop early check for valid identjk/rebase-i-drop-ident-checkJeff King2016-07-292-3/+47
* | | Merge branch 'va/i18n'Junio C Hamano2016-09-2110-106/+109
|\ \ \
| * | | i18n: update-index: mark warnings for translationVasco Almeida2016-09-151-6/+6
| * | | i18n: show-branch: mark plural strings for translationVasco Almeida2016-09-151-5/+9
| * | | i18n: show-branch: mark error messages for translationVasco Almeida2016-09-151-8/+8
| * | | i18n: receive-pack: mark messages for translationVasco Almeida2016-09-151-33/+25
| * | | notes: spell first word of error messages in lowercaseVasco Almeida2016-09-152-33/+33
| * | | i18n: notes: mark error messages for translationVasco Almeida2016-09-151-9/+11
| * | | i18n: merge-recursive: mark verbose message for translationVasco Almeida2016-09-151-1/+1
| * | | i18n: merge-recursive: mark error messages for translationVasco Almeida2016-09-151-7/+10
| * | | i18n: config: mark error message for translationVasco Almeida2016-09-151-2/+2
| * | | i18n: branch: mark option description for translationVasco Almeida2016-09-151-1/+1
| * | | i18n: blame: mark error messages for translationVasco Almeida2016-09-152-10/+12
* | | | Merge branch 'jt/format-patch-base-info-above-sig'Junio C Hamano2016-09-212-9/+30
|\ \ \ \
| * | | | format-patch: show base info before email signaturejt/format-patch-base-info-above-sigJosh Triplett2016-09-152-9/+30
| |/ / /
* | | | Merge branch 'ks/perf-build-with-autoconf'Junio C Hamano2016-09-211-1/+7
|\ \ \ \
| * | | | t/perf/run: copy config.mak.autogen & friends to build areaks/perf-build-with-autoconfKirill Smelkov2016-09-151-1/+7
* | | | | Merge branch 'mr/vcs-svn-printf-ulong'Junio C Hamano2016-09-211-2/+2
|\ \ \ \ \
| * | | | | vcs-svn/fast_export: fix timestamp fmt specifiersmr/vcs-svn-printf-ulongMike Ralphson2016-09-141-2/+2
* | | | | | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'Junio C Hamano2016-09-212-1/+26
|\ \ \ \ \ \
| * | | | | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-contextRené Scharfe2016-09-142-1/+26
* | | | | | | Merge branch 'rs/unpack-trees-reduce-file-scope-global'Junio C Hamano2016-09-211-4/+5
|\ \ \ \ \ \ \
| * | | | | | | unpack-trees: pass checkout state explicitly to check_updates()René Scharfe2016-09-131-4/+5
* | | | | | | | Merge branch 'rs/strbuf-remove-fix'Junio C Hamano2016-09-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | strbuf: use valid pointer in strbuf_remove()rs/strbuf-remove-fixRené Scharfe2016-09-131-1/+1
* | | | | | | | | Merge branch 'rs/pack-sort-with-llist-mergesort'Junio C Hamano2016-09-211-24/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sha1_file: use llist_mergesort() for sorting packsrs/pack-sort-with-llist-mergesortRené Scharfe2016-09-131-24/+15