]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 017d1e1 fc001b5)
Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2011 18:41:43 +0000 (10:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2011 18:41:43 +0000 (10:41 -0800)
commitf44054c82f4199ccff14f472e4fd7904b0db8ff5
treea34aedc1fb8a8f919bb7ce86a91ed9f0b6d43848tree | snapshot
parent017d1e134545db0d162908f3538077eaa1f34fb6commit | diff
parentfc001b526c42e5fb776340136a2fb247e391a61bcommit | diff
Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious

* nd/maint-ignore-exclude:
  checkout,merge: loosen overwriting untracked file check based on info/exclude
builtin/checkout.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.