repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
silence some -Wuninitialized false positives
2012-11-24
J
e
ns L
e
hmann
Teach rm to rem
o
ve submod
u
les
when given with a trail
i
ng '/'
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-10-29
Jens Le
h
mann
s
ubmodule status: remove unused orig_* variables
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
Jens Lehmann
submo
d
ul
e
ad
d
: Fai
l
w
h
en
.
git
/
modu
l
es/<name> already
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
Jen
s
L
e
hman
n
Teach "git submodule add" the --name option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-29
J
e
n
s
Lehmann
s
ubmodule: teach rm to r
e
move submodules unless they
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-03
Jens Leh
m
ann
submodule:
u
s
e argv_array instead
o
f hand-building
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-07-12
Jen
s
Lehmann
submodu
l
es:
d
on
'
t
s
tumble over
s
ymbolic links when
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-29
Jens Lehmann
su
b
modules: print
"
regi
s
tere
d
for path" m
e
ssag
e
only
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-20
Jens Le
h
mann
Cons
i
stently use "supe
r
projec
t
" ins
t
ead of
"
supermod
u
le"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-04-14
Jens
L
e
hmann
submodule
s
: rec
u
rs
i
ve fetch also che
c
ks ne
w
tags for
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Jens Lehmann
submodu
l
es: refactor computation of relative gitdir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Je
n
s Lehmann
submodul
e
s: always use a r
e
lat
i
ve
p
ath fr
o
m gitdir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Jen
s
Lehmann
submodules: a
l
ways
use a relative p
a
th to gitdir
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-24
Jens Lehmann
s
u
bmod
u
le
add: fix
breakage whe
n
re-addi
n
g a de
e
p submodul
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-17
Jens Leh
m
ann
test-lib: add the test_pause
convenience function
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-03
Jens Lehman
n
docs: describe b
e
havior of relat
i
ve s
u
bmodule URLs
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-12-08
Jens Lehmann
diff/sta
t
us: p
r
int sub
m
odule path when look
i
n
g
f
o
r
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-09-09
Jen
s
Lehmann
fetch:
s
kip on-demand ch
e
cking
w
hen
n
o submodules are
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-08-01
J
ens
L
eh
m
a
nn
Doc
u
menta
t
ion/submodu
l
e:
a
d
d com
m
and refer
e
n
c
es and
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-28
Jens Leh
m
ann
su
b
module: update and
add must honor -
-
quiet
flag
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-24
Jens Leh
m
ann
tests
:
p
ri
n
t failed test n
u
mber
s
a
t the end
o
f the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-26
Jens L
e
hmann
submodule add: al
w
ay
s
i
nitial
i
z
e
.
g
i
t/c
o
nfig
e
ntry
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-20
Jens Lehman
n
fetch: Also fetch submodules in s
u
bdi
r
ectories in on
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jens Lehma
n
n
submodule a
d
d: clean up du
p
licated code
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jens Lehm
a
nn
submodul
e
add: allow relative repository pat
h
even
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jens Lehman
n
submod
u
le
ad
d
: test
f
ailure
wh
e
n u
r
l is n
o
t
configured
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
Jens
L
ehman
n
Teach read-tree th
e
-n|
-
-dry-r
u
n opt
i
on
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
Jens Lehmann
unp
a
ck-trees:
a
dd the dry_run flag to unpack_tree
s
_
o
pti
o
n
s
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-14
Jens Lehmann
S
ubmodules
:
Don't
p
a
r
se
.
gi
t
m
o
dules when it
contains
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-28
Je
n
s
L
ehma
n
n
tests: fix overeager
s
crubbing o
f
environment
variable
s
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens
L
ehmann
fe
t
ch/pull
:
D
e
s
c
r
i
b
e
-
-recurse-submodule restric
t
ions
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
J
ens Lehmann
submodule update: Don't
f
etch wh
e
n the submodul
e
c
ommit
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
fetch/p
u
ll: D
o
n't
r
ecurse into a submodule when
commits
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Je
n
s Lehmann
S
u
b
m
od
u
les
:
A
dd
'
on-d
e
mand
'
val
u
e for
t
he
'
fetchRecurseSubmo
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
config: teach th
e
fetch
.
recurseSubmodules
o
ption the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehman
n
f
e
tc
h
/pull:
A
dd the 'on-
d
emand' v
a
lue to the --
r
ecu
r
se
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
fet
c
h/pull
:
recurse in
t
o submodu
l
e
s
when necessary
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-02-07
Jens L
e
hmann
pull: Do
c
um
e
nt the "--[no-
]
recurse-
s
u
bmodule
s
" options
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-01-31
Jens Lehmann
t5526: Fix
wron
g
argu
m
ent
or
d
er in "
g
it config"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-12-07
J
e
ns Leh
m
an
n
git submodule: Remove now obsolete tests before cloning
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens Lehmann
S
u
b
modules: Add t
h
e
"
fetchRecurseS
u
bmodul
e
s" config
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens Lehmann
Add
the '
f
etch
.
r
e
curseSubm
o
dules' config setting
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens Lehm
a
nn
f
et
c
h/pull: Add the --
r
ecu
r
se-submodu
l
es
option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-05
Jens Lehmann
clone:
Add the --re
c
urse-submodules
o
ption as alias
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-03
Jens Lehmann
pull:
R
emove --tags o
p
tion from manpag
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-09
Jens Lehm
a
n
n
t1
0
20: Get rid of 'cd "$HE
R
E
"
' at th
e
st
a
rt
o
f each
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
J
ens Lehmann
Several
t
ests
:
cd ins
i
de subsh
e
ll
i
nste
a
d of around
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
t3404 & t7508: cd ins
i
de su
b
shell in
s
t
ead
o
f
around
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
t5505: add missi
n
g &&
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
Jens Leh
m
ann
t7406 & t7407: a
d
d missing && at end of li
n
es
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
Je
n
s Lehmann
t7405: cd inside subshell i
n
stead of around
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
J
ens L
e
hmann
checkout: Use subm
o
dule
.
*
.
ignore settings from
.
git
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
Jens Lehmann
checkout: A
d
d test fo
r
diff
.
ignor
e
Submodules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-22
J
e
ns Lehmann
t7403: add missing
&
&'s
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Add test
s
for
the d
i
ff
.
i
gno
r
eSub
m
odule
s
config
o
pt
i
on
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Jens
Leh
m
ann
Su
b
modul
e
s: U
s
e "ignore" settings from
.
gitmod
u
l
es
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
J
e
ns Lehmann
Submodules: A
d
d the new "ignore" c
o
nfig o
p
tion
f
or
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-19
Jen
s
Lehmann
git
submodule add: Require
t
he new --force option to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-12
J
e
ns Lehmann
g
i
t
a
dd: Add the
"
--
i
gnore-
m
issi
n
g"
option
f
o
r the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
J
ens Le
h
m
ann
Add the o
p
tio
n
"
--igno
r
e
-
sub
m
o
d
u
l
es"
to "git s
t
atus"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
Jens L
e
hmann
g
i
t
s
ubmodule: ignore
d
irty submodules fo
r
summa
r
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jens L
e
hmann
Add opt
i
on
a
l
p
a
rameters to the diff option "
-
-ignore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jens Lehmann
g
i
t di
f
f
: rename test
t
hat had a conflicti
n
g
n
ame
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-17
Jens Lehma
n
n
gitk: D
i
splay dirty subm
o
dules
correctly
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehm
a
nn
Teac
h
diff --submodule and status
t
o
h
an
d
le
.
git f
i
les
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Let check_preimage() use me
m
set() to
ini
t
ialize "struct
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-20
Jens Lehmann
gitk: Add Ct
r
l-W shortc
u
t for
closing the activ
e
w
indow
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-14
Jens Lehmann
git status: ignoring un
t
racked f
i
l
e
s
must
a
pply to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehmann
git
status:
Fix fals
e
po
s
itive "new
c
o
m
mits" output
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehmann
Refactor dirty submodule detection
i
n di
f
f
-lib
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-10
J
e
n
s
L
ehma
n
n
g
it su
b
module sum
m
ary: Handle
HEA
D
as arg
u
ment when
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-08
Jens Lehmann
g
i
t status: Show
d
etail
e
d
d
i
rty st
a
tus of submodu
l
es
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-05
Jens
L
e
h
mann
git diff -
-
submodule: Show d
e
tailed dirty statu
s
of
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-02-01
Je
n
s
L
e
hmann
U
p
d
a
tes fo
r
dirty sub
m
odules in re
l
e
ase no
t
e
s and u
s
er
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehmann
Fix mem
o
ry le
a
k in
submodul
e
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-28
J
en
s
Leh
m
ann
git-gui: Quote git path when startin
g
another
g
ui i
n
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Jens L
e
hmann
Teac
h
d
iff --submo
d
ule that
modified submod
u
le
d
irecto
r
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Jens
Le
h
m
a
nn
g
it diff: Don't test submodule dirtin
e
s
s with
--ig
n
o
r
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens Leh
m
ann
gi
t
-gu
i
: Add a special diff popup menu fo
r
submodules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens L
e
hmann
git-gui: Us
e
git diff --submodule
w
hen available
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens L
e
hmann
gi
t
-gui: Correct fil
e
_st
a
tes when unstaging partly
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-19
Jen
s
Lehman
n
Performance optim
i
zatio
n
for
d
e
t
ectio
n
o
f modified
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jens Lehmann
git
s
tatus: Show uncommitted submod
u
le changes too
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jens Lehmann
S
how sub
m
odules
a
s
m
odi
f
ied
w
h
e
n
t
hey contain a dirty
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
Jens L
e
hmann
gitk: Use the --submodule
o
pt
i
on for displaying d
i
f
f
s
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
J
ens Lehmann
gitk: Fix dif
f
ing
committed -> staged
(
typo in
d
iffcmd)
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-10-24
J
e
ns Le
h
ma
n
n
add tests for git diff --
s
ubmodule
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-25
Jens Lehma
n
n
git-gui: fix
use
o
f u
n
initi
a
lized v
a
riable
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-22
J
ens Lehma
n
n
gi
t
submo
d
ule add
:
make the
<path>
parameter optiona
l
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-27
Jens Leh
m
ann
git
-
gui:
f
ix diff for parti
a
l
l
y st
a
ged submo
d
ule ch
a
nges
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-15
Jens Lehm
a
nn
git sub
m
odule summary:
a
dd --file
s
option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-10
J
ens Lehmann
git-gui: display summa
r
y
when showing diff of a
s
u
bmodule
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-05
Jens Lehmann
Documentation
:
git s
u
bmodule: add missi
n
g options to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-08
Jens Lehmann
git-g
u
i:
run po
s
t-checkout hoo
k
after c
l
on
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Jens Lehmann
git-gui:
run
p
ost-checkout hoo
k
on checkout
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Jen
s
Le
h
ma
n
n
git-gui: When
calling post
-
co
m
m
it hook wrong v
a
riable
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-22
Jens Le
h
mann
githooks docu
m
enta
t
i
o
n:
post-chec
k
out hook is also
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-20
J
en
s
Lehm
a
n
n
git-gui: Fix merge c
o
nfli
c
t display error when filename
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree