diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-26 03:54:05 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-26 03:54:05 -0500 |
| commit | ce9735dfbd77ab7cbcb97ba8749b2f6eaa7f2527 (patch) | |
| tree | bbd390b3de160e810ae5667caa6aef38573119a0 /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | e4834837a8a02708efb6a7f8a248087a8cd49ab3 (diff) | |
| download | git-ce9735dfbd77ab7cbcb97ba8749b2f6eaa7f2527.tar.gz git-ce9735dfbd77ab7cbcb97ba8749b2f6eaa7f2527.zip | |
git-gui: Let users abort with `reset --hard` type logic.
If you get into the middle of a merge that turns out to be horrible
and just not something you want to do right now, odds are you need
to run `git reset --hard` to recover your working directory to a
pre-merge state.
We now offer Merge->Abort Merge for exactly this purpose, however
its also useful to thow away a non-merge, as its basically the same
logic as `git reset --hard`.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions