All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: git@vger.kernel.org
Subject: using oldest date when squashing commits
Date: Sat, 19 Mar 2022 13:48:51 +0100	[thread overview]
Message-ID: <YjXRM5HiRizZ035p@ugly> (raw)

moin,

during interactive rebasing, i sometimes find it necessary to move a 
hunk from one commit to a later one in the branch. now, if that hunk 
cannot be re-ordered with the later commit due to conflicting with it, 
it becomes necessary to squash the later commit onto a temporary commit 
created from the extracted hunk, not the other way around (or using a 
stash). unfortunately, this causes the author date of the later commit 
to be reset, which can rather seriously falsify the date if the branch 
is long-lived.

i know how to manually work around that, but that's not exactly user 
friendly.

my first thought was to create an --oldest-date option (essentially 
complementary to --ignore-date).

but i wonder whether it even needs to be an option? why would anyone not 
want that behavior, unless they are explicitly resetting the date 
anyway?

thanks

             reply	other threads:[~2022-03-19 12:48 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-19 12:48 Oswald Buddenhagen [this message]
2022-03-20  8:05 ` using oldest date when squashing commits Johannes Sixt
2022-03-20 10:53   ` Oswald Buddenhagen
2023-10-24  9:26   ` Phillip Wood
2023-10-24 10:18     ` Oswald Buddenhagen
2023-10-24 14:00       ` Phillip Wood
2023-10-24 17:30         ` Junio C Hamano
2023-10-24 20:13           ` Oswald Buddenhagen
2023-10-24 21:19           ` Johannes Sixt
2023-10-27 12:34             ` Marc Branchaud
2023-10-27 12:45               ` Oswald Buddenhagen
2023-10-27 13:20                 ` Marc Branchaud
2023-10-27 13:26                   ` Oswald Buddenhagen
2023-10-27 13:46                     ` Marc Branchaud
2023-10-27 23:24               ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YjXRM5HiRizZ035p@ugly \
    --to=oswald.buddenhagen@gmx.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.