Files
git/Documentation
Junio C Hamano 9ca488c04b Merge branch 'nd/rebase-show-current-patch'
The new "--show-current-patch" option gives an end-user facing way
to get the diff being applied when "git rebase" (and "git am")
stops with a conflict.

* nd/rebase-show-current-patch:
  rebase: introduce and use pseudo-ref REBASE_HEAD
  rebase: add --show-current-patch
  am: add --show-current-patch
2018-03-06 14:54:02 -08:00
..
2018-02-28 13:39:24 -08:00
2018-02-27 10:34:03 -08:00
2018-03-06 14:54:01 -08:00
2017-11-17 10:31:05 +09:00
2017-11-18 12:31:29 +09:00
2017-04-13 16:15:25 -07:00
2017-11-06 14:24:24 +09:00
2016-08-11 14:35:42 -07:00
2017-06-27 10:35:49 -07:00
2018-02-07 12:46:48 -08:00
2017-01-18 15:12:18 -08:00