diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-17 15:54:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-17 15:54:39 -0700 |
| commit | 22b49b7fb960921146ebc7b49fe1f014e828b671 (patch) | |
| tree | 4737964c219837cbcf786ff7fb88bb6158fe482a /git-merge-recursive.py | |
| parent | c7e3a75121877ecc8ea60c2d3873a1c6c504ed68 (diff) | |
| parent | fcc387db9bc453dc7e07a262873481af2ee9e5c8 (diff) | |
| download | git-22b49b7fb960921146ebc7b49fe1f014e828b671.tar.gz | |
Merge branch 'jc/read-tree-safety' into next
* jc/read-tree-safety:
read-tree -m -u: do not overwrite or remove untracked working tree files.
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions