diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-09-03 09:24:16 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-09-05 10:47:44 +0000 |
| commit | 880579dc1e368bd6111b6f2d4c4449f4d42cd1b3 (patch) | |
| tree | 606173b467acb04ee75e0b2809671976d38e1cdd /ChangeLog | |
| parent | 5445d5f0cc26f03eda26f8c74723a8fb65466586 (diff) | |
| download | zsh-880579dc1e368bd6111b6f2d4c4449f4d42cd1b3.tar.gz zsh-880579dc1e368bd6111b6f2d4c4449f4d42cd1b3.tar.xz zsh-880579dc1e368bd6111b6f2d4c4449f4d42cd1b3.zip | |
36410: vcs_info git: Present merge heads as patches
This shows, during 'git merge', the revision hashes of the "remote" head (the one that will become second parent of the commit) in the %m expando. Review-by: Frank Terbeck
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index bb2d507c2..05d6999ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-09-05 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 36410: Doc/Zsh/contrib.yo + Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git: + Present merge heads as patches + 2015-09-04 Peter Stephenson <p.stephenson@samsung.com> * 36421: Src/pattern.c: can't-get-the-staff fix for idiocy in |