summaryrefslogtreecommitdiffstats
path: root/merge-recursive.c (unfollow)
Commit message (Expand)AuthorFilesLines
2016-09-26get_sha1: detect buggy calls with multiple disambiguatorsJeff King2-0/+9
2016-09-22Fourth batch for 2.11Junio C Hamano1-15/+86
2016-09-19Start preparing for 2.10.1Junio C Hamano2-1/+34
2016-09-19Third batch for 2.11Junio C Hamano1-0/+11
2016-09-15Second batch for 2.11Junio C Hamano1-0/+25
2016-09-15t/perf/run: copy config.mak.autogen & friends to build areaKirill Smelkov1-1/+7
2016-09-15i18n: update-index: mark warnings for translationVasco Almeida1-6/+6
2016-09-15i18n: show-branch: mark plural strings for translationVasco Almeida1-5/+9
2016-09-15i18n: show-branch: mark error messages for translationVasco Almeida1-8/+8
2016-09-15i18n: receive-pack: mark messages for translationVasco Almeida1-33/+25
2016-09-15notes: spell first word of error messages in lowercaseVasco Almeida2-33/+33
2016-09-15i18n: notes: mark error messages for translationVasco Almeida1-9/+11
2016-09-15i18n: merge-recursive: mark verbose message for translationVasco Almeida1-1/+1
2016-09-15i18n: merge-recursive: mark error messages for translationVasco Almeida1-7/+10
2016-09-15i18n: config: mark error message for translationVasco Almeida1-2/+2
2016-09-15i18n: branch: mark option description for translationVasco Almeida1-1/+1
2016-09-15i18n: blame: mark error messages for translationVasco Almeida2-10/+12
2016-09-15format-patch: show base info before email signatureJosh Triplett2-9/+30
2016-09-15xdiff: fix merging of hunks with -W context and -u contextRené Scharfe2-1/+26
2016-09-14vcs-svn/fast_export: fix timestamp fmt specifiersMike Ralphson1-2/+2
2016-09-14sha1_file: use llist_mergesort() for sorting packsRené Scharfe1-24/+15
2016-09-14unpack-trees: pass checkout state explicitly to check_updates()René Scharfe1-4/+5
2016-09-14checkout: constify parameters of checkout_stage() and checkout_merged()René Scharfe1-3/+3
2016-09-14pathspec: remove unnecessary function prototypesBrandon Williams1-2/+0
2016-09-14strbuf: use valid pointer in strbuf_remove()René Scharfe1-1/+1
2016-09-14t1007: factor out repeated setupJeff King1-24/+8
2016-09-14init: reset cached config when entering new repoJeff King4-0/+50
2016-09-14init: expand comments explaining config trickeryJeff King1-4/+7
2016-09-14config: only read .git/config from configured reposJeff King6-4/+33
2016-09-14test-config: setup git directoryJeff King1-0/+3
2016-09-14t1302: use "git -C"Jeff King1-24/+6
2016-09-14pager: handle early configJeff King1-2/+33
2016-09-14pager: use callbacks instead of configsetJeff King1-14/+33
2016-09-14pager: make pager_program a file-local staticJeff King3-2/+1
2016-09-14pager: stop loading git_default_config()Jeff King2-4/+8
2016-09-14pager: remove obsolete commentJeff King1-5/+0
2016-09-14diff: always try to set up the repositoryJeff King2-2/+22
2016-09-14diff: handle --no-index prefixes consistentlyJeff King2-0/+21
2016-09-14diff: skip implicit no-index check when given --no-indexJeff King1-12/+13
2016-09-14patch-id: use RUN_SETUP_GENTLYJeff King2-1/+15
2016-09-14hash-object: always try to set up the git repositoryJeff King2-5/+19
2016-09-13http: always remove curl easy from curlm session on releaseEric Wong1-4/+6
2016-09-13http: consolidate #ifdefs for curl_multi_remove_handleEric Wong1-7/+10
2016-09-13http: warn on curl_multi_add_handle failuresEric Wong1-0/+2
2016-09-13First batch for 2.11Junio C Hamano1-0/+41
2016-09-13add: document the chmod optionThomas Gummerer1-1/+6
2016-09-12pack-objects: use reachability bitmap index when generating non-stdout packKirill Smelkov3-8/+49
2016-09-12pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is ...Kirill Smelkov2-33/+156
2016-09-12patch-ids: refuse to compute patch-id for merge commitJeff King1-0/+15
2016-09-12add_delta_base_cache: use list_for_each_safeJeff King1-2/+2