git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [GSoC][PATCH 0/1] rebase -i: support --ignore-whitespace
@ 2019-07-12 18:50 Rohit Ashiwal
  2019-07-12 18:50 ` [GSoC][PATCH 1/1] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
                   ` (5 more replies)
  0 siblings, 6 replies; 32+ messages in thread
From: Rohit Ashiwal @ 2019-07-12 18:50 UTC (permalink / raw)
  To: git, gitster
  Cc: phillip.wood123, martin.agren, Johannes.Schindelin, Rohit Ashiwal

[cc'ing Phillip Wood, Martin Ågren and Dscho; they might be interested]

There are two backends available for rebasing, viz, the am and the interactive.
Naturally, there shall be some features that are implemented in one but not in
the other. One such flag is --ignore-whitespace which indicated merge mechanism
to treat lines with only whitespace changes as unchanged.

NB: am's --ignore-space-change (also aliased --ignore-whitespace; see git-apply's
description) not only share the same name with diff's --ignore-space-change and
merge's -Xignore-space-change, but the similarity in naming appears to have been
intentional with am's --ignore-space-change being designed to have the same
functionality (see e.g. the commit messages for f008cef ("Merge branch
'jc/apply-ignore-whitespace'", 2014-06-04) and 4e5dd04 ("merge-recursive: options
to ignore whitespace changes", 2010-08-26)).

For the most part, these options do provide the same behaviour. However, there
are some edge cases where both apply's --ignore-space-change and merge's
-Xignore-space-change fall short of optimal behaviour, and that too in different
ways. Fixing these differences in edge cases is left for future work.

Rohit Ashiwal (1):
  rebase -i: add --ignore-whitespace flag

 Documentation/git-rebase.txt            |  9 +++-
 builtin/rebase.c                        | 24 +++++++--
 sequencer.h                             |  1 +
 t/t3422-rebase-incompatible-options.sh  |  1 -
 t/t3431-rebase-options-compatibility.sh | 66 +++++++++++++++++++++++++
 5 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100755 t/t3431-rebase-options-compatibility.sh

-- 
2.21.0


^ permalink raw reply	[flat|nested] 32+ messages in thread

end of thread, other threads:[~2019-08-02 21:00 UTC | newest]

Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-12 18:50 [GSoC][PATCH 0/1] rebase -i: support --ignore-whitespace Rohit Ashiwal
2019-07-12 18:50 ` [GSoC][PATCH 1/1] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-07-15 17:57   ` Junio C Hamano
2019-07-15 22:00     ` Rohit Ashiwal
2019-07-15 22:08       ` Junio C Hamano
2019-07-15 22:42         ` Rohit Ashiwal
2019-07-12 18:53 ` [GSoC][PATCH 0/2] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-07-18 19:03   ` [GSoC][PATCH v2 " Rohit Ashiwal
2019-07-18 19:03     ` [GSoC][PATCH v2 1/2] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-07-18 19:03     ` [GSoC][PATCH v2 2/2] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-07-19 22:36       ` Junio C Hamano
2019-08-02 20:57         ` Rohit Ashiwal
2019-07-20 14:56       ` Phillip Wood
2019-07-23 19:57         ` Rohit Ashiwal
2019-07-24 13:33           ` Phillip Wood
2019-07-19 21:26     ` [GSoC][PATCH v2 0/2] " Junio C Hamano
2019-07-19 21:47       ` Junio C Hamano
2019-07-12 18:53 ` [GSoC][PATCH 1/2] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-07-15 18:04   ` Junio C Hamano
2019-07-12 18:53 ` [GSoC][PATCH 2/2] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-07-14 11:31   ` Rohit Ashiwal
2019-07-18 18:55 ` [GSoC][PATCH v2 0/1] rebase -i: support --ignore-whitespace Rohit Ashiwal
2019-07-18 18:55   ` [GSoC][PATCH v2 1/1] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-07-19 21:33     ` Junio C Hamano
2019-07-23 19:59       ` Rohit Ashiwal
2019-07-23 20:57         ` Junio C Hamano
2019-07-22 10:00     ` Phillip Wood
2019-07-23 19:58       ` Rohit Ashiwal
2019-07-23 21:01         ` Elijah Newren
2019-07-24 11:14           ` Johannes Schindelin
2019-07-24 21:18 ` [GSoC][PATCH v3 0/1] " Rohit Ashiwal
2019-07-24 21:18   ` [GSoC][PATCH v3 1/1] " Rohit Ashiwal

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).