diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-09 07:47:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-09 07:47:09 +0100 |
| commit | ff86bdd5cac70850eea4791bea78efa19b228ebe (patch) | |
| tree | e80c89fbffa06c6990886a92112547cf66ca2a07 /git-merge-octopus.sh | |
| parent | Merge git://git.bogomips.org/git-svn (diff) | |
| parent | Merge branch 'mm/maint-merge-ff-error-message-fix' into maint (diff) | |
| download | git-ff86bdd5cac70850eea4791bea78efa19b228ebe.tar.xz git-ff86bdd5cac70850eea4791bea78efa19b228ebe.zip | |
Merge branch 'maint'
* maint:
add-interactive: fix deletion of non-empty files
pull: clarify advice for the unconfigured error case
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions