diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:25:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:25:12 -0800 |
| commit | 9ef569791f967c1559b498d8f77a2c42a14be2ed (patch) | |
| tree | afd2b29be852150fd4f74d57e257ab47729ca86c /builtin/commit.c | |
| parent | Merge branch 'vr/git-merge-default-to-upstream' (diff) | |
| parent | checkout,merge: loosen overwriting untracked file check based on info/exclude (diff) | |
| download | git-9ef569791f967c1559b498d8f77a2c42a14be2ed.tar.gz git-9ef569791f967c1559b498d8f77a2c42a14be2ed.zip | |
Merge branch 'nd/maint-ignore-exclude'
* nd/maint-ignore-exclude:
checkout,merge: loosen overwriting untracked file check based on info/exclude
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions