summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:21 -0700
commit1d699f79340b40b8020d9ed570aab124186fbd97 (patch)
tree05921d40c4e61e4fc41c089dbb0496cde9fae27c /contrib/emacs
parentMerge branch 'jc/replacing' (diff)
parentSubmodules: Don't parse .gitmodules when it contains, merge conflicts (diff)
downloadtgif-1d699f79340b40b8020d9ed570aab124186fbd97.tar.xz
Merge branch 'jl/submodule-conflicted-gitmodules'
* jl/submodule-conflicted-gitmodules: Submodules: Don't parse .gitmodules when it contains, merge conflicts test that git status works with merge conflict in, .gitmodules
Diffstat (limited to 'contrib/emacs')
0 files changed, 0 insertions, 0 deletions