development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-19 16:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
57845 commits 6 branches 952 tags 534 MiB
Commit graph

3 commits

Author SHA1 Message Date
Rohit Ashiwal 08187b4cba rebase -i: support --ignore-date 
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let's add the same
for interactive machinery.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-11-02 15:37:12 +09:00
Rohit Ashiwal cbd8db17ac rebase -i: support --committer-date-is-author-date 
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-11-02 15:36:23 +09:00
Rohit Ashiwal ba51d2fb24 rebase -i: add --ignore-whitespace flag 
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 indicates merge mechanism to treat lines
with only whitespace changes as unchanged. Wire the interactive
rebase to also understand the --ignore-whitespace flag by
translating it to -Xignore-space-change.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-11-02 15:34:50 +09:00