Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: git/git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 86b56ff267962ab91aa368b10d6df10b1e9e291e
Choose a base ref
...
head repository: git/git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c9192f9e45f12f7e4c93488eb77a3098e75a78cc
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 2, 2023

  1. sequencer: beautify subject of reverts of reverts 

    Instead of generating a silly-looking `Revert "Revert "foo""`, make it
a more humane `Reapply "foo"`.

This is done for two reasons:
- To cover the actually common case of just a double revert.
- To encourage people to rewrite summaries of recursive reverts by
  setting an example (a subsequent commit will also do this explicitly
  in the documentation).

To achieve these goals, the mechanism does not need to be particularly
sophisticated. Therefore, more complicated alternatives which would
"compress more efficiently" have not been implemented.

Signed-off-by: Oswald Buddenhagen <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
    @ossilator @gitster
    ossilator authored and gitster committed Sep 2, 2023
    1 Configuration menu
    Copy the full SHA
    883cb1b View commit details
    Browse the repository at this point in the history

  2. git-revert.txt: add discussion 

    The section is inspired by git-commit.txt.

Signed-off-by: Oswald Buddenhagen <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
    @ossilator @gitster
    ossilator authored and gitster committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    c9192f9 View commit details
    Browse the repository at this point in the history
Loading