repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update cygwin.c for new mingw-64 win32 api headers
2012-10-29
Je
n
s
Lehmann
su
b
module st
a
tus: remove
unused orig_* vari
a
bles
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
J
ens Lehman
n
su
b
module add: Fail when
.
g
i
t/modules/<n
a
me> already
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
Jens Lehma
n
n
Teac
h
"git su
b
module add" the -
-
name option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-29
Jens Lehmann
submodule: teach rm to
remove submodu
l
es unless
they
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-03
Jens Le
h
mann
subm
o
dule: use argv_ar
r
ay instead of hand-bu
i
lding
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-07-12
Jens Le
h
mann
s
u
bmodules:
d
o
n't stumble ov
e
r s
y
mbolic links whe
n
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-29
J
ens Lehmann
su
b
modules:
print "registered for pa
t
h"
message only
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-20
Jens Lehmann
Consi
s
tentl
y
us
e
"superproject" instead of "supermodule"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-04-14
Jens Lehmann
submodules: rec
u
r
s
ive fe
t
ch also che
c
ks new tags
f
o
r
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
J
ens Lehmann
submodules: refactor computation of
re
l
ative
g
i
tdir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
J
ens Lehman
n
submodules: always use a re
l
ative p
a
th from gi
t
dir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Jens Leh
m
an
n
submodules:
a
lw
a
ys use a rela
t
i
v
e path
t
o g
i
t
dir
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-24
J
e
ns Lehmann
submodule add
:
fix b
r
eakage when re
-
adding
a
deep
s
ubmodule
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-17
Je
n
s Lehman
n
t
est-lib: add the test
_
pause conve
n
ience functio
n
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-03
Jens
L
eh
m
ann
docs: descr
i
b
e behavior o
f
relative
s
ub
m
o
d
ule URLs
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-12-08
Jen
s
Le
h
mann
d
iff/status: pr
i
nt
s
ub
m
od
u
l
e
p
a
th when l
o
oking for
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-09-09
Jens Lehmann
fetch: skip on-dem
a
nd checkin
g
when n
o
su
b
mo
d
ules ar
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-08-01
Jen
s
Lehmann
Documentation/sub
m
odule: add command references an
d
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-28
Jens Lehmann
submodu
l
e:
update and add must
h
onor
-
-quiet flag
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-24
Jens Lehmann
tes
t
s: print fa
i
le
d
test numbers
a
t t
h
e end of the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-26
Jens Lehmann
submodul
e
add: always initialize
.
git/config entry
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-20
Jens Lehmann
fetch: Also fetch subm
o
dules in sub
d
irectories in on
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jens Lehmann
submodul
e
add: clean
u
p
dup
l
icated code
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Je
n
s Leh
m
ann
submod
u
le
a
dd: allow
r
ela
t
ive repos
i
tory path
eve
n
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jen
s
Lehmann
s
u
bmodule ad
d
: t
e
st failu
r
e when ur
l
is not configured
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
Jens
Le
h
mann
Teach r
e
ad-tree th
e
-n|--dr
y
-run option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
Jens Le
h
m
ann
unpack
-
trees: add the dr
y
_run
f
l
ag
t
o un
p
ack_tre
e
s_op
t
i
ons
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-14
Jens Lehm
a
nn
Submodules
:
D
o
n't par
s
e
.
gitmodules when it contains
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-28
Je
n
s Le
h
m
a
nn
tests: fix overeage
r
sc
r
ub
b
ing of e
n
viron
m
ent variables
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
fetch/pull: Des
c
ribe --recurse-s
u
bmodule restr
i
ctions
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Leh
m
ann
sub
m
odule update: Don't
fetch w
h
e
n
t
he sub
m
odul
e
commi
t
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens
L
e
h
mann
fetch/pull:
D
on't rec
u
rse into a
s
ub
m
odule when commi
t
s
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
J
ens
Lehmann
Submodules: Add
'on-de
m
and'
value for the
'f
e
tchRecurseSubmo
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Je
n
s
Lehma
n
n
con
f
ig
:
teach the fetc
h
.
recurseSubmodules option the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
J
e
ns Le
h
mann
f
etc
h
/pull: Add t
h
e 'on-demand' va
l
ue to
t
he --
r
ecurse
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Je
n
s Lehma
n
n
fetch/pull:
recurse into submodules when necessar
y
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-02-07
Je
n
s Lehmann
pu
l
l: Doc
u
ment the "--
[
no-]recurse-su
b
m
o
dules" o
p
t
i
ons
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-01-31
Je
n
s Lehmann
t5526: Fix
w
rong argument order in "git config"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-12-07
Jens L
e
h
m
an
n
g
it submodule: Remove now obsolete tests
befor
e
cloning
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens
L
e
hma
n
n
S
u
bmo
d
u
l
es:
Add the "fetc
h
Re
c
urseSu
b
modul
e
s
"
con
f
ig
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens Lehmann
Add the 'fetch
.
r
e
curseSubmodules' config setti
n
g
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens
L
ehman
n
fetch/pull
:
Add the
-
-recu
r
se-sub
m
odules opti
o
n
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-05
Je
n
s
L
ehm
a
nn
clo
n
e:
Add the
--recu
r
s
e
-submod
u
le
s
option as alias
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-03
Jens Lehmann
p
u
ll:
R
emove
-
-tags
o
p
t
ion from m
a
npage
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-09
Jens
L
ehmann
t
1
0
20: Get rid of 'cd "$HERE"'
a
t
the start
o
f each
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Je
n
s Le
h
mann
Se
v
eral test
s
: cd inside sub
s
hell instea
d
of around
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
t340
4
& t7508: cd insid
e
s
u
bshell instead of
a
ro
u
nd
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens L
e
hmann
t5505: add missi
n
g
&
&
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t
7
406 & t740
7
: a
d
d missing && at e
n
d of lines
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
Jens
Lehmann
t7405: cd
i
nside subshell inst
e
ad
of
a
round
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
J
e
ns
Le
h
mann
checkout: Use
submodule
.
*
.
i
g
nore
set
t
ings from
.
git
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
Jens Le
h
m
ann
ch
e
c
k
o
ut: Add t
e
st for diff
.
ign
o
reSubm
o
dules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-22
Jens L
e
hmann
t7403: add miss
i
n
g &&'s
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Add te
s
ts f
o
r the
d
iff
.
ig
n
o
reSubmodules config o
p
t
io
n
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
S
u
bmodules: Use "ignore" settings
f
rom
.
gitmodule
s
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Jen
s
Lehma
n
n
Submodules: A
d
d the n
e
w "i
g
nore" config
o
ption for
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git
submodule a
d
d: Require the n
e
w --f
o
rc
e
option t
o
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git add: Add the "--ignore-missing
"
o
ption f
o
r the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
J
e
n
s Lehma
n
n
Add
t
he option "--ign
o
re-s
u
bmodules
"
to "gi
t
statu
s
"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
J
ens
L
ehmann
git submodule: ign
o
re di
r
ty
s
ubmodules
for summa
r
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jens L
e
hm
a
nn
A
d
d optio
n
al parameters to the diff
o
pti
o
n "--ignore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jen
s
Lehmann
git
d
iff: rename test that ha
d
a co
n
f
l
icting
n
a
m
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-17
Jens Le
h
ma
n
n
gitk: Display dirty submo
d
ules
c
orrectly
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Teach diff --submod
u
le a
n
d status to handle
.
gi
t
f
i
les
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Let che
c
k_preima
g
e()
use m
e
mset()
t
o initializ
e
"str
u
c
t
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-20
Jens Le
h
mann
git
k
:
Add Ctrl-W sh
o
rtcut for
clos
i
ng the active w
i
ndow
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-14
Jens Lehmann
git
status:
i
g
norin
g
unt
r
ack
e
d files must ap
p
ly
t
o
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
J
en
s
Le
h
m
a
nn
g
it status
:
Fix false positive "new commits" output
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehman
n
Refactor dirty
submodu
l
e de
t
ection in
d
iff-lib
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-10
J
ens Lehmann
git submodule
summary:
H
a
ndle HEAD as argu
m
ent when
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-08
J
e
ns L
e
hm
a
nn
g
i
t
s
tatus: Show detailed
d
irty status of
s
ubm
o
dules
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-05
Jens
Leh
m
ann
git diff --subm
o
dule: Sho
w
detailed dirty stat
u
s of
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-02-01
Jen
s
Lehmann
U
p
d
a
tes for
d
irty s
u
b
m
o
dules in
r
e
l
e
a
se
note
s
and user
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-31
Jens
L
ehmann
Fix me
m
ory leak
in submodule
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-28
Jens Lehmann
git-
g
ui: Qu
o
t
e
git
p
a
t
h when starting another
gui
in
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
J
ens L
e
hmann
Teac
h
diff --submodule that modifi
e
d
s
ubmo
d
ule
d
ire
c
tory
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
J
ens Lehmann
g
i
t diff: Don'
t
test submodule
d
irtiness with --ignore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens Lehmann
git
-
gui: Add a special diff popup menu
for submodules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
J
e
n
s
Lehmann
g
i
t-gui
:
Use git diff --s
u
bm
o
du
l
e when
available
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens Lehman
n
g
i
t-
g
ui: Correc
t
file_state
s
when
u
n
sta
g
ing par
t
l
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-19
Jens Lehmann
Performance
o
ptimiza
t
ion for detection of mo
d
ified
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jens
L
ehmann
git stat
u
s
:
Sho
w
uncommi
t
ted submo
d
ule changes too
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jens Lehmann
Show submo
d
ul
e
s
a
s modified when they contain a dirty
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
J
e
ns Lehmann
gitk: Use
t
he --s
u
bmodule option for displaying diffs
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
Jens Lehm
a
nn
gitk: Fix diffing c
o
m
m
itted -> stag
e
d
(
typo i
n
diffcmd)
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-10-24
Je
n
s L
e
h
m
ann
a
dd tests for git diff --
s
ubmodu
l
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-25
Jens Lehma
n
n
git-gu
i
: fix use of uni
n
itial
i
zed variable
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-22
Jens Lehmann
git submo
d
ule add: make the <p
a
t
h> p
a
rameter optiona
l
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-27
Jens Lehmann
git-gui: fix diff for parti
a
lly staged submodule
changes
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-15
Jens Le
h
mann
git s
u
b
m
od
u
l
e summary: add
-
-
files option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-10
Jens Lehmann
git-gui: di
s
play su
m
mary when showing diff of
a submo
d
ule
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-05
Jens Le
h
m
a
nn
Documentati
o
n:
g
it submodule: add m
i
ss
i
n
g
options to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-08
J
ens L
e
hmann
git-gui: run pos
t
-c
h
eckout hook after clone
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Jens
Lehmann
git-gui: ru
n
post-che
c
kout
hook
o
n c
h
eckout
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Jens Lehmann
gi
t
-
g
ui: W
h
en calling post-
c
ommit hook
wrong variab
l
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-22
Jens L
e
hmann
git
h
ooks documentation:
p
o
s
t
-checkout hook
is also
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-20
J
e
ns Lehmann
g
it-g
u
i: Fix merge conflict disp
l
a
y
e
r
r
or wh
e
n
fil
e
na
m
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree