Skip to content

Instantly share code, notes, and snippets.

@yurial
Created February 25, 2012 16:29
Show Gist options
  • Star 16 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save yurial/1909363 to your computer and use it in GitHub Desktop.
Save yurial/1909363 to your computer and use it in GitHub Desktop.
show author on rebase
fix:
/usr/libexec/git-core/git-rebase--interactive
-git rev-list $merges_option --pretty=oneline --abbrev-commit\
+git rev-list $merges_option --pretty=">%h (%an <%ae>) %s"\
result:
1 pick 19f43c1 (Yuri Dyachenko <yurial@gplvote.org>) add: gcrypt::noerr
2 pick 990a7e8 (Yuri Dyachenko <yurial@gplvote.org>) add: gcrypt::throwif( err ) throw if err != noerr
3 pick cb03f3b (Yuri Dyachenko <yurial@gplvote.org>) add: ext::move<T> move semantic
4 pick da46555 (Yuri Dyachenko <yurial@gplvote.org>) fix: Makefile.in +@CXXFLAGS@
5 pick 6c7ac68 (Yuri Dyachenko <yurial@gplvote.org>) add: excplict private copy-constructor
6 pick b216278 (Yuri Dyachenko <yurial@gplvote.org>) fix: gcrypt::asymmetric::key_t add native_t type
7 pick d0713d4 (Yuri Dyachenko <yurial@gplvote.org>) fix: use throwif()
8 pick bc2d743 (Yuri Dyachenko <yurial@gplvote.org>) add: gcrypt::sexp_t::build()
9 pick eb988cd (Yuri Dyachenko <yurial@gplvote.org>) add: gcrypt::sexp_t(const ext::move<>&)
10 pick 3cf49ee (Yuri Dyachenko <yurial@gplvote.org>) fix: rsa_t::pub_t() using sexp_t::build
11 pick 2a06667 (Yuri Dyachenko <yurial@gplvote.org>) add: rsa::priv_t::generate()
12 pick cf1b9b9 (Yuri Dyachenko <yurial@gplvote.org>) fix: rsa::priv_t(ext::move<>&)
13 pick 1710154 (Yuri Dyachenko <yurial@gplvote.org>) fix: test/sexp use new gcrypt::sexp_t::build()
14 pick f188265 (Yuri Dyachenko <yurial@gplvote.org>) fix: test/rsa rsa key generator
15
16 # Rebase 77ca052..f188265 onto 77ca052
17 #
18 # Commands:
19 # p, pick = use commit
20 # r, reword = use commit, but edit the commit message
21 # e, edit = use commit, but stop for amending
22 # s, squash = use commit, but meld into previous commit
23 # f, fixup = like "squash", but discard this commit's log message
24 # x, exec = run command (the rest of the line) using shell
25 #
26 # If you remove a line here THAT COMMIT WILL BE LOST.
27 # However, if you remove everything, the rebase will be aborted.
28 #
@lkraav
Copy link

lkraav commented Apr 7, 2012

exactly what i needed

@zcoder
Copy link

zcoder commented Apr 17, 2012

@fpereira1
Copy link

fpereira1 commented Feb 3, 2016

This is great, but unfortunately it breaks the --autosquash feature (git version 2.6.3)

Since git 2.6.0 you can add a config variable rebase.instructionFormat to do this. in this case:

git config --global --add rebase.instructionFormat "(%an <%ae>) %s"

@jackvial
Copy link

Thanks. Works perfect.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment