diff options
| author | Mark A. Hershberger | 2010-01-24 23:52:26 -0500 |
|---|---|---|
| committer | Mark A. Hershberger | 2010-01-24 23:52:26 -0500 |
| commit | b1bb0a2570b8a40017220097c40c6057cfe17efe (patch) | |
| tree | d308182f02f1d459ea9a21c31a8ca8b0f3b4f787 /etc | |
| parent | aaef4f91fad60716fa070b912d71b9f1ccd2e7b4 (diff) | |
| parent | 8dc1adf681df162bfd305debef0e1ab31bed3ebd (diff) | |
| download | emacs-b1bb0a2570b8a40017220097c40c6057cfe17efe.tar.gz emacs-b1bb0a2570b8a40017220097c40c6057cfe17efe.zip | |
merge conflict
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 3 |
1 files changed, 0 insertions, 3 deletions
| @@ -322,9 +322,6 @@ backends do not support this. | |||
| 322 | **** The short log format for git makes use of the graph display, so | 322 | **** The short log format for git makes use of the graph display, so |
| 323 | it's not supported on git versions earlier than 1.5. | 323 | it's not supported on git versions earlier than 1.5. |
| 324 | 324 | ||
| 325 | **** The new variable vc-git-add-signoff can be used to add a | ||
| 326 | Signed-off-by line when committing. | ||
| 327 | |||
| 328 | **** Support for operating with stashes has been added to vc-dir: the stash list is | 325 | **** Support for operating with stashes has been added to vc-dir: the stash list is |
| 329 | displayed in the *vc-dir* header, stashes can be created, removed, applied and | 326 | displayed in the *vc-dir* header, stashes can be created, removed, applied and |
| 330 | their content displayed. | 327 | their content displayed. |