diff options
| author | Eli Zaretskii | 2010-01-25 12:42:44 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-25 12:42:44 -0500 |
| commit | 639dd35751e5d43072ef14bc679286136a4feae9 (patch) | |
| tree | 93a8f5700a211c913d4628607ee6a10f79ad6790 /etc | |
| parent | b7faba0c9c3d8cb994720e2cccc92a538196d56d (diff) | |
| parent | e2396d80cbf7e9d20c05eff44c1c8f04ecb9341c (diff) | |
| download | emacs-639dd35751e5d43072ef14bc679286136a4feae9.tar.gz emacs-639dd35751e5d43072ef14bc679286136a4feae9.zip | |
Merge from mainline.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 5 |
1 files changed, 2 insertions, 3 deletions
| @@ -322,15 +322,14 @@ 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. |
| 331 | 328 | ||
| 332 | **** vc-dir displays the stash status | 329 | **** vc-dir displays the stash status |
| 333 | 330 | ||
| 331 | **** vc-dir requires at least git-1.5.5. | ||
| 332 | |||
| 334 | *** vc-bzr supports operating with shelves: the shelve list is | 333 | *** vc-bzr supports operating with shelves: the shelve list is |
| 335 | displayed in the *vc-dir* header, shelves can be created, removed and applied. | 334 | displayed in the *vc-dir* header, shelves can be created, removed and applied. |
| 336 | 335 | ||