|
1 |
| -<b><code>git-uncommit</code></b>: <b>uncommit</b> and <b>recommit</b> commands for Git, undo and save Git commits to patch files |
| 1 | +<b><code>git-uncommit</code></b>: Undo git commits to patch files, and reapply them. |
2 | 2 |
|
3 | 3 | <b><i>git-uncommit</i></b> does exactly what it says: it uncommits the last Git commit, saving the patch.
|
4 | 4 |
|
@@ -37,33 +37,33 @@ To run <b><i>git-recommit</i></b> with any saved patch file to reapply it in the
|
37 | 37 | $ git-recommit <patch-file>.patch
|
38 | 38 | ````
|
39 | 39 |
|
40 |
| -## Patches |
| 40 | +## Patches files |
41 | 41 |
|
42 |
| -Patches can be readily edited, shared with others and applied in a new order. |
| 42 | +Patch files can be readily edited, shared with others and applied in a new order. |
43 | 43 |
|
44 |
| -Patches are created using ```git format-patch```, and thus can be applied using ```git am```. |
| 44 | +The patches are created using ```git format-patch```, and thus can also be applied using ```git am```. |
45 | 45 |
|
46 |
| -Patches are given readable file names extracted from your commit messages. |
| 46 | +Readable file names, extracted from your commit messages, are given to the patch files created. |
47 | 47 |
|
48 | 48 | ## Comparison with related Git commands
|
49 | 49 |
|
50 |
| -```git stash``` can sometimes be used for similar purposes as ```git-uncommit```, the differences are: |
51 |
| -* ```git stash``` operates on changes to the work tree or index, not already committed changes |
52 |
| -* ```git stash``` does not create a patch file, but saves the changes in the Git archive |
| 50 | +```git stash``` can sometimes be used for similar purposes as <i>git-uncommit</i>, the differences are: |
| 51 | +* <i>git stash</i> operates on changes to the work tree or index, not already committed changes |
| 52 | +* <i>git stash</i> does not create a patch file, but saves the changes in the Git archive |
53 | 53 |
|
54 | 54 | ```git reset HEAD^``` can also be used to revert the last commit, however the changes are not saved to a patch file, they are either discarded or left in the index or work tree, depending on the options
|
55 | 55 |
|
56 |
| -``STGit```: a tool that can also be used to reorder or edit commits, the main differences are: |
57 |
| -* ```STGit``` has a much more complex set of command |
58 |
| -* ```STGit``` does not save patch files automatically |
| 56 | +```STGit```: a tool that can also be used to reorder or edit commits, the main differences are: |
| 57 | +* <i>STGit</i> has a much more complex set of command |
| 58 | +* <i>STGit</i> does not save patch files automatically |
59 | 59 |
|
60 | 60 | ## Installation
|
61 | 61 |
|
62 |
| -<b><i>git-uncommit</i></b> and <b><i>git-recommit</i></b> are stand-alone shell scripts, simply requiring Git to be installed. |
| 62 | +<i>git-uncommit</i> and <i>git-recommit</i> are stand-alone shell scripts, simply requiring Git to be installed. |
63 | 63 |
|
64 |
| -In a Unix or Linux system, you can quickly install <b><i>git-recommit</i></b> and <b><i>git-uncommit</i></b> by copying the files to ```/usr/local/bin```. |
| 64 | +In a Unix or Linux system, you can quickly install ```git-recommit``` and ```git-uncommit``` by copying the files to ```/usr/local/bin```. |
65 | 65 |
|
66 |
| -Installing ```uni2ascii``` will help <b><i>git-uncommit</i></b> create better filenames for patches, when your commit messages have non-ascii characters. |
| 66 | +Installing ```uni2ascii``` will help <i>git-uncommit</i> create better filenames for patches, when your commit messages have non-ascii characters. |
67 | 67 |
|
68 | 68 | ## Author and licensing terms
|
69 | 69 |
|
|
0 commit comments