diff options
author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2013-09-08 21:14:00 +0100 |
---|---|---|
committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2013-09-08 21:14:00 +0100 |
commit | cc83fd9916e1c0ea3c13162127e8f61b165974f2 (patch) | |
tree | 885f278da1f93f1e958ffb08b37f568cfa510474 /ChangeLog | |
parent | 061e80950223501fbcb77e987a9a0dafedf6f229 (diff) | |
parent | c7213566462e2a7279e19a22027fa23b21c8e722 (diff) | |
download | zsh-cc83fd9916e1c0ea3c13162127e8f61b165974f2.tar.gz zsh-cc83fd9916e1c0ea3c13162127e8f61b165974f2.tar.xz zsh-cc83fd9916e1c0ea3c13162127e8f61b165974f2.zip |
conflict resolution
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 43167cc3a..829973181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ add execute-never style for MIME handler for files on alien file systems. +2013-09-07 Luka Perkov <luka@openwrt.org> + + * 31708: Completion/Unix/Command/_git: _git: add --fixup and + --squash options to commit + 2013-09-06 Peter Stephenson <p.w.stephenson@ntlworld.com> * Luka Perkov: 31702: Completion/Unix/Command/_git: |