https://github.com/aconchillo/git-cherry-base
Merge git commits interactively
https://github.com/aconchillo/git-cherry-base
Last synced: 3 months ago
JSON representation
Merge git commits interactively
- Host: GitHub
- URL: https://github.com/aconchillo/git-cherry-base
- Owner: aconchillo
- Created: 2012-11-15T01:04:50.000Z (over 13 years ago)
- Default Branch: master
- Last Pushed: 2012-11-15T06:21:05.000Z (over 13 years ago)
- Last Synced: 2025-03-10T19:53:10.296Z (over 1 year ago)
- Language: Scheme
- Homepage:
- Size: 117 KB
- Stars: 1
- Watchers: 2
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.org
Awesome Lists containing this project
README
# -*- org -*-
* git-cherry-base
Sometimes you need to merge a huge list of commits into a branch, and
you might not want all of them. [[http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html][git-rebase]] already helps with this task
but it becomes less convenient when you have lots of commits as you may
not remeber all of them and also because it doesn't show you the
contents of each commit.
*git-cherry-base* is an interactive script (written in [[http://www.gnu.org/software/guile/][Guile]]) that lets
you choose which commits you'd like to merge and even which parts of the
commit you want. Given a list of revisions (obtained from [[http://www.kernel.org/pub/software/scm/git/docs/git-rev-list.html][git-rev-list]])
it will show the contents for each commit and will let you choose if you
want to merge the commit, skip it or merge only parts of it.
*git-cherry-base* receives a file with a list of revisions in it (one per
line). The file can be obviously manually modified before giving it to
the script.
: Usage: git-cherry-base