]> git.ipfire.org Git - thirdparty/git.git/commit - strbuf.h
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e0720a3 0eabf4b)
Merge branch 'pk/rebase-in-c-3-acts'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:54 +0000 (11:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:54 +0000 (11:04 +0900)
commit39f73315454d2553b2d3219a58f5110a60eba5a1
tree2a55eab60e69c17bba16f115e775ce1aacf49e6ftree | snapshot
parente0720a3867b85ad2fe0e92378973670b8b7f444bcommit | diff
parent0eabf4b95ca2d3213194de95cc9cd62593811965commit | diff
Merge branch 'pk/rebase-in-c-3-acts'

Rewrite "git rebase" in C.

* pk/rebase-in-c-3-acts:
  builtin rebase: stop if `git am` is in progress
  builtin rebase: actions require a rebase in progress
  builtin rebase: support --edit-todo and --show-current-patch
  builtin rebase: support --quit
  builtin rebase: support --abort
  builtin rebase: support --skip
  builtin rebase: support --continue
builtin/rebase.c diff1 | diff2 | blob | history
strbuf.c diff1 | diff2 | blob | history
strbuf.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.