summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18nva/git-gui-i18nJunio C Hamano2016-09-263-3/+3012
|\
| * git-gui: l10n: add Portuguese translationVasco Almeida2016-09-262-0/+3009
| * git-gui i18n: mark strings for translationVasco Almeida2016-09-261-3/+3
* | 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
* | | | | | | | | | | Merge branch 'rs/checkout-some-states-are-const'Junio C Hamano2016-09-211-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()rs/checkout-some-states-are-constRené Scharfe2016-09-131-3/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/setup-sequence-update'Junio C Hamano2016-09-2116-99/+268
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t1007: factor out repeated setupjk/setup-sequence-updateJeff King2016-09-131-24/+8
| * | | | | | | | | | | init: reset cached config when entering new repoJeff King2016-09-134-0/+50
| * | | | | | | | | | | init: expand comments explaining config trickeryJeff King2016-09-131-4/+7
| * | | | | | | | | | | config: only read .git/config from configured reposJeff King2016-09-136-4/+33
| * | | | | | | | | | | test-config: setup git directoryJeff King2016-09-131-0/+3
| * | | | | | | | | | | t1302: use "git -C"Jeff King2016-09-131-24/+6
| * | | | | | | | | | | pager: handle early configJeff King2016-09-131-2/+33
| * | | | | | | | | | | pager: use callbacks instead of configsetJeff King2016-09-131-14/+33
| * | | | | | | | | | | pager: make pager_program a file-local staticJeff King2016-09-133-2/+1
| * | | | | | | | | | | pager: stop loading git_default_config()Jeff King2016-09-132-4/+8
| * | | | | | | | | | | pager: remove obsolete commentJeff King2016-09-131-5/+0
| * | | | | | | | | | | diff: always try to set up the repositoryJeff King2016-09-132-2/+22
| * | | | | | | | | | | diff: handle --no-index prefixes consistentlyJeff King2016-09-132-0/+21