summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/add-p-recount'Junio C Hamano2018-06-281-1/+1
|\
| * add -p: fix counting empty context lines in edited patchesPhillip Wood2018-06-111-1/+1
* | add--interactive: compute the empty tree valuebrian m. carlson2018-05-021-2/+9
* | Merge branch 'pw/add-p-single'Junio C Hamano2018-04-021-1/+1
|\ \
| * | add -p: fix 2.17.0-rc* regression due to moved codepw/add-p-singleÆvar Arnfjörð Bjarmason2018-03-311-1/+1
* | | Merge branch 'jk/add-i-diff-filter'Junio C Hamano2018-03-141-0/+8
|\ \ \
| * | | add--interactive: detect bogus diffFilter outputjk/add-i-diff-filterJeff King2018-03-051-0/+8
* | | | Merge branch 'pw/add-p-recount'Junio C Hamano2018-03-141-22/+86
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | add -p: don't rely on apply's '--recount' optionpw/add-p-recountPhillip Wood2018-03-051-1/+1
| * | add -p: fix counting when splitting and coalescingPhillip Wood2018-03-051-0/+11
| * | add -p: calculate offset delta for edited patchesPhillip Wood2018-03-051-9/+50
| * | add -p: adjust offsets of subsequent hunks when one is skippedPhillip Wood2018-03-011-2/+13
| * | add -i: add function to format hunk headerPhillip Wood2018-02-201-10/+11
* | | add -p: improve error messagesPhillip Wood2018-02-131-3/+15
* | | add -p: only bind search key if there's more than one hunkPhillip Wood2018-02-131-23/+27
* | | add -p: only display help for active keysPhillip Wood2018-02-131-1/+7
| |/ |/|
* | add--interactive: ignore submodule changes except HEADnd/add-i-ignore-submodulesNguyễn Thái Ngọc Duy2018-01-161-1/+1
|/
* Merge branch 'pw/unquote-path-in-git-pm'Junio C Hamano2017-07-101-42/+1
|\
| * add -i: move unquote_path() to Git.pmPhillip Wood2017-06-301-42/+1
* | Merge branch 'jk/add-p-commentchar-fix'Junio C Hamano2017-06-261-1/+2
|\ \
| * | add--interactive: quote commentChar regexjk/add-p-commentchar-fixJeff King2017-06-211-1/+1
| * | add--interactive: handle EOF in prompt_yesnoJeff King2017-06-211-0/+1
* | | add--interactive: drop diff.indentHeuristic handlingmb/diff-default-to-indent-heuristicsJeff King2017-05-091-4/+0
| |/ |/|
* | Merge branch 'va/i18n-perl-scripts'Junio C Hamano2017-04-191-1/+1
|\ \
| * | git-add--interactive.perl: add missing dot in a messageva/i18n-perl-scriptsRalf Thielow2017-04-131-1/+1
* | | Merge branch 'jk/add-i-use-pathspecs'Junio C Hamano2017-03-171-11/+2
|\ \ \
| * | | add--interactive: do not expand pathspecs with ls-filesjk/add-i-use-pathspecsJeff King2017-03-141-11/+2
* | | | add--interactive: fix missing file prompt for patch mode with "-i"jk/add-i-patch-do-promptJeff King2017-03-021-4/+4
|/ / /
* | | Merge branch 'rt/align-add-i-help-text'Junio C Hamano2017-02-241-1/+1
|\ \ \
| * | | git add -i: replace \t with blanks in the help messagert/align-add-i-help-textRalf Thielow2017-02-221-1/+1
* | | | Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano2017-01-101-3/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | diff: retire "compaction" heuristicsjc/retire-compaction-heuristicsJunio C Hamano2016-12-231-3/+0
* | | | Merge branch 'va/i18n-perl-scripts'Junio C Hamano2016-12-271-114/+215
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | i18n: add--interactive: mark status words for translationVasco Almeida2016-12-141-6/+6
| * | i18n: add--interactive: remove %patch_modes entriesVasco Almeida2016-12-141-21/+0
| * | i18n: add--interactive: mark edit_hunk_manually message for translationVasco Almeida2016-12-141-13/+39
| * | i18n: add--interactive: i18n of help_patch_cmdVasco Almeida2016-12-141-8/+46
| * | i18n: add--interactive: mark patch prompt for translationVasco Almeida2016-12-141-8/+46
| * | i18n: add--interactive: mark plural stringsVasco Almeida2016-12-141-9/+18
| * | i18n: add--interactive: mark strings with interpolation for translationVasco Almeida2016-12-141-12/+13
| * | i18n: add--interactive: mark simple here-documents for translationVasco Almeida2016-12-141-3/+5
| * | i18n: add--interactive: mark strings for translationVasco Almeida2016-12-141-34/+42
* | | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-191-1/+4
|/ /
* | add--interactive: respect diff.compactionHeuristicjk/add-i-diff-compact-heuristicsJeff King2016-06-161-0/+4
* | add--interactive: allow custom diff highlighting programsjk/add-i-highlightJeff King2016-02-281-2/+10
|/
* Merge branch 'ak/add-i-empty-candidates'Junio C Hamano2015-02-171-0/+5
|\
| * add -i: return from list_and_choose if there is no candidateak/add-i-empty-candidatesAlexander Kuleshov2015-01-221-0/+5
* | add--interactive: leave main loop on read errorjk/add-i-read-errorJeff King2014-12-151-0/+1
|/
* Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-081-2/+2
|\
| * code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-311-2/+2