git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Tue, 13 Nov 2018 13:37:23 +0000 (22:37 +0900)
committer	Junio C Hamano <redacted>
	Tue, 13 Nov 2018 13:37:23 +0000 (22:37 +0900)
commit	6b2a52431b238fc3c25ea931def6e5b1cf9e78fb
tree	bda721edc23a6a3cd7bfb960aecc5dabfafeb7f2	tree \| snapshot
parent	fd4bb3806bcccbd8afa5dd45052ea37a882708ba	commit \| diff
parent	4d010a757c40d6e6e478354991bd052ef30cb853	commit \| diff

Merge branch 'pw/am-rebase-read-author-script'

Unify code to read the author-script used in "git am" and the
commands that use the sequencer machinery, e.g. "git rebase -i".

* pw/am-rebase-read-author-script:
  sequencer: use read_author_script()
  add read_author_script() to libgit
  am: rename read_author_script()
  am: improve author-script error reporting
  am: don't die in read_author_script()

builtin/am.c	diff1 \|	diff2 \|	blob \| history
sequencer.c	diff1 \|	diff2 \|	blob \| history
sequencer.h	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

builtin/am.c	diff1 \|	diff2 \|	blob \| history
sequencer.c	diff1 \|	diff2 \|	blob \| history
sequencer.h	diff1 \|	diff2 \|	blob \| history