summaryrefslogtreecommitdiffstats
path: root/mergetools/xxdiff (unfollow)
Commit message (Expand)AuthorFilesLines
2016-12-12difftool: rename variables for consistencyDavid Aguilar1-14/+14
2016-12-12difftool: chdir as early as possibleDavid Aguilar1-12/+14
2016-12-12difftool: sanitize $workdir as early as possibleDavid Aguilar1-3/+2
2016-12-12difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2-3/+45
2016-12-12mingw: intercept isatty() to handle /dev/null as Git expects itJohannes Schindelin2-0/+36
2016-12-10doc: omit needless "for"Kristoffer Haugsbakk1-1/+1
2016-12-10doc: make the intent of sentence clearerKristoffer Haugsbakk1-1/+1
2016-12-10doc: add verb in front of command to runKristoffer Haugsbakk1-1/+1
2016-12-10doc: add articles (grammar)Kristoffer Haugsbakk1-3/+3
2016-12-09sequencer: remove useless get_dir() functionStephan Beyer1-6/+1
2016-12-09sequencer: make sequencer abort saferStephan Beyer2-1/+50
2016-12-09t3510: test that cherry-pick --abort does not unsafely change HEADStephan Beyer1-0/+10
2016-12-09commit: remove 'Clever' message for --only --amendAndreas Krey1-2/+0
2016-12-08diff: handle --no-abbrev in no-index caseJack Bates8-1/+39
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2-3/+45
2016-12-08am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer1-1/+1
2016-12-08am: fix filename in safe_to_abort() error messageStephan Beyer1-1/+1
2016-12-08shallow.c: remove useless codeNguyễn Thái Ngọc Duy1-4/+0
2016-12-08shallow.c: bit manipulation tweaksRasmus Villemoes1-4/+4
2016-12-08shallow.c: avoid theoretical pointer wrap-aroundRasmus Villemoes1-1/+1
2016-12-08shallow.c: make paint_alloc slightly more robustNguyễn Thái Ngọc Duy1-0/+3
2016-12-08shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory poolsNguyễn Thái Ngọc Duy1-2/+4
2016-12-08shallow.c: rename fields in paint_info to better express their purposesNguyễn Thái Ngọc Duy1-9/+9
2016-12-06stash: prefer plumbing over git-diffJeff King2-1/+10
2016-12-06http-walker: complain about non-404 loose object errorsJeff King2-3/+6
2016-12-06http: treat http-alternates like redirectsJeff King3-3/+44
2016-12-06http: make redirects more obviousJeff King6-3/+81
2016-12-06remote-curl: rename shadowed options variableJeff King1-9/+9
2016-12-06http: always update the base URL for redirectsJeff King4-4/+21
2016-12-06http: simplify update_url_from_redirectJeff King1-6/+4
2016-12-06docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider4-15/+25
2016-12-05t0021: minor filter process test cleanupLars Schneider1-3/+2
2016-12-05git-p4: fix empty file processing for large file system backend GitLFSLars Schneider2-12/+19
2016-12-05travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux buildLars Schneider1-2/+2
2016-12-05commit: make --only --allow-empty work without pathsAndreas Krey3-2/+12
2016-12-05t3600: remove useless redirectStefan Beller1-1/+1
2016-12-05unpack-trees: fix grammar for untracked files in directoriesStefan Beller2-2/+2
2016-12-05preparing for 2.10.3Junio C Hamano2-1/+49
2016-12-01convert: git cherry-pick -Xrenormalize did not workTorsten Bögershausen1-6/+7
2016-11-29pull: fast-forward "pull --rebase=true"Junio C Hamano2-4/+35
2016-11-29Git 2.11v2.11.0Junio C Hamano2-1/+6
2016-11-29common-main: stop munging argv[0] pathJeff King4-9/+10
2016-11-29t7610: clean up foo.XXXXXX tmpdirJeff King1-1/+2
2016-11-29mergetools/vimdiff: trust Vim's exit codeDavid Aguilar1-0/+4
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar20-38/+71
2016-11-29l10n: ru.po: update Russian translationDimitriy Ryazantcev1-2066/+2868
2016-11-29l10n: ca.po: update translationAlex Henrie1-2123/+3020
2016-11-29RelNotes: spelling and phrasing fixupsMarc Branchaud1-76/+72
2016-11-29merge-recursive.c: use string_list_sort instead of qsortNguyễn Thái Ngọc Duy1-9/+7
2016-11-28worktree list: keep the list sortedNguyễn Thái Ngọc Duy4-1/+36