diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-11 16:57:39 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-11 16:57:39 +0200 |
| commit | 9849897f59fa7ed0e0df0666165c06aed94f0bc1 (patch) | |
| tree | 72c8a6d7401bbf8fbc5c950e0a51be14dd4d8532 /Documentation | |
| parent | e29087e6f8a070349f8d60c7374dc8356887a0ed (diff) | |
magit-wip-log{,-current}: new commands
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/2.2.0.txt | 4 | ||||
| -rw-r--r-- | Documentation/magit.org | 25 |
2 files changed, 25 insertions, 4 deletions
diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt index d0e4aa1..3c30ffe6 100644 --- a/Documentation/RelNotes/2.2.0.txt +++ b/Documentation/RelNotes/2.2.0.txt @@ -101,6 +101,10 @@ THIS IS NOT COMPLETE. disagree, so the option `magit-branch-read-upstream-first' has been added. It defaults to t. +* New commands `magit-wip-log' and `magit-wip-log-current' allow + showing log for a branch and its wip refs (which the various wip + modes commit to). + * New command `magit-submodule-deinit'. * New command `magit-commit-augment' allows the user to pick a commit diff --git a/Documentation/magit.org b/Documentation/magit.org index 7595a54..ed10044 100644 --- a/Documentation/magit.org +++ b/Documentation/magit.org @@ -3561,10 +3561,27 @@ commit does not change the fork-point of the working tree wip ref. The fork-points are not adjusted until there actually is a change that should be committed to the respective wip ref. -To recover a lost change from a wip ref, use the reflog. To show the -reflog, use e.g. ~lO refs/wip/index/refs/heads/master RET~ and then move -around until you find the commit which has the lost change. You might -then be able to simply apply it using ~a~ (~magit-apply~). +To view the log for the a branch and its wip refs use the commands +~magit-wip-log~ and ~magit-wip-log-current~. You should use ~--graph~ when +using these commands. Alternatively you can use the reflog to show +all commits that ever existed on a wip ref. You can then recover lost +changes from the commits shown in the log or reflog. + +- Command: magit-wip-log + + This command shows the log for a branch and its wip refs. + + With a negative prefix argument only the worktree wip ref is shown. + The absolute numeric value of the prefix argument controls how many + "branches" of each wip ref are shown. + +- Command: magit-wip-log-current + + This command shows the log for the current branch and its wip refs. + + With a negative prefix argument only the worktree wip ref is shown. + The absolute numeric value of the prefix argument controls how many + "branches" of each wip ref are shown. There exists a total of three global modes that save to the wip refs, which might seem excessive, but allows fine tuning of when exactly |