repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-p4.py: support Python 2.4
2012-11-24
Jens L
e
hmann
Teach rm t
o
remove submodule
s
when giv
e
n
w
ith a
trailing '/'
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-10-29
Jens Lehmann
submod
u
le
stat
u
s: r
e
move unu
s
ed or
i
g_
*
variab
l
es
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
Jens Lehmann
s
u
b
module
add: Fail when
.
git/modul
e
s/<na
m
e> already
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
Jens Lehmann
Teach
"git
s
ubmodule add" the --name option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-29
Jens Lehma
n
n
submodule: teach rm to
remo
v
e su
b
modul
e
s
unless they
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-03
J
e
ns
L
e
hmann
s
ubmodule: use argv_array
ins
t
ead
of
ha
n
d-buildin
g
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-07-12
Jens Lehmann
subm
o
dules: don't stumble
over symbolic links whe
n
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-29
J
e
ns Leh
m
ann
s
u
bmodule
s
:
print
"
re
g
istered for path" message
o
n
ly
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-20
J
ens Lehmann
C
onsistent
l
y use
"superproject" instead of
"supermod
u
le"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-04-14
J
en
s
Lehmann
submod
u
les: recursive
fetch
a
l
so check
s
new tags
f
o
r
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
J
e
ns
Lehmann
s
ubmodul
e
s: refacto
r
comp
u
tation of re
l
a
t
ive gitdir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Jen
s
Lehman
n
subm
o
dules: a
l
ways use
a re
l
ative path from gi
t
dir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
J
e
ns Lehmann
submodules:
a
lways use a relative path
to
g
itdir
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-24
Jens Lehma
n
n
sub
m
odu
l
e add: fix breakage when
r
e-addin
g
a
d
ee
p
s
ubmo
d
u
le
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-17
Jens Le
h
mann
test-lib
:
a
dd
the t
e
st_pause conveni
e
nce function
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-03
Jens
Lehman
n
d
o
cs: describe
behavior of relative submod
u
le
UR
L
s
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-12-08
Jens Lehmann
d
i
ff/status: print submodule path wh
e
n looki
n
g
fo
r
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-09-09
Jens Lehmann
f
e
t
ch: sk
i
p on-de
m
and chec
k
ing when
n
o subm
o
dules
are
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-08-01
Jens Lehm
a
nn
Docume
n
tation/sub
m
o
d
ule: add command
references
and
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-28
Jens Lehm
a
nn
subm
o
dule:
u
pdate and add must honor --quiet flag
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-24
J
e
ns L
e
hmann
t
ests: print
f
ail
e
d test numbers at the end of t
h
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-26
Jen
s
Lehmann
submodule a
d
d: always i
n
it
i
alize
.
g
i
t
/config
e
ntr
y
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-20
Jens Leh
m
ann
fetc
h
:
A
l
so fetch submodules in
subdirectorie
s
in on
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jens L
e
hm
a
nn
submodu
l
e a
d
d: clea
n
up duplicated code
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Je
n
s Lehmann
submodu
l
e
add: allow relative repository
path even
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jens Lehm
a
nn
submodul
e
add:
test fai
l
ure whe
n
url is not c
o
nfigured
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
Jens L
e
hmann
Teach
r
e
ad-t
r
ee the -n
|
--dry-run option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
Jens Lehman
n
unpack-trees: add the d
r
y_ru
n
flag
t
o
unpa
c
k
_tr
e
es_options
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-14
Jens
Lehman
n
Submodules
:
Don't
parse
.
gi
t
modules when it contains
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-28
Jens
Lehmann
tests: fix overeager scrubbing of environment variables
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
J
e
ns Le
h
m
a
nn
fetch/pull:
D
e
s
c
ribe --re
c
urs
e
-submo
d
ule re
s
trictions
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
s
ubmodul
e
update: D
o
n't fetch when the submodule commit
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
fetch/pull: Don't recurse into a submodule wh
e
n commit
s
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
J
ens Lehman
n
S
u
bmodules
:
Add '
o
n-demand
'
value for the 'fetchRe
c
urseSubmo
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Le
h
ma
n
n
c
onfig: tea
c
h the fetch
.
recurseSubmodules o
p
tion the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Leh
m
a
nn
fetch/pull: Add
t
he 'on-demand' value to the
-
-re
c
ur
s
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Je
n
s Leh
m
an
n
fetch/pull:
recurse into sub
m
odule
s
when necessary
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-02-07
Jens Lehmann
pull:
Document the "--[no-]r
e
curse-submodules
"
options
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-01-31
J
ens Lehmann
t55
2
6:
F
ix wrong argument orde
r
in "
g
it
c
onfig"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-12-07
Jens Lehmann
git submo
d
ule:
Remove n
o
w obsolete
t
ests before cloning
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens
Lehmann
Submodules: Add the "fetc
h
Rec
u
rseS
u
b
modules"
c
onfig
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens Lehmann
Add the 'fetch
.
recurseSubmodules' config setti
n
g
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Je
n
s Lehmann
fetch/pu
l
l: Add t
h
e
--recur
s
e-submodules
o
p
t
ion
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-05
Jens Lehmann
c
lone:
A
d
d t
h
e --recurse-
s
u
bmodules opti
o
n 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 fro
m
manpage
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-09
Je
n
s L
e
hmann
t102
0
: Get rid of 'cd "$HERE"' at t
h
e start
o
f each
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehm
a
nn
Seve
r
al tests: cd i
n
side subshell instead o
f
around
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens Leh
m
ann
t34
0
4 & t7508:
c
d inside subshel
l
instead
o
f around
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
t
5
505: add miss
i
n
g &&
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
Je
n
s Lehmann
t7
4
06 & t
7
407:
a
dd
m
i
ssin
g
&& at end
of li
n
es
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehman
n
t7405
:
cd inside sub
s
hell instead of
around
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
Jens Lehmann
ch
e
ckout: Use submod
u
le
.
*
.
i
g
nore settings fro
m
.
git
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
Jen
s
Le
h
mann
checkout
:
Add test for diff
.
ignoreSu
b
modules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-22
Jens Lehma
n
n
t7403: add
m
issin
g
&
&
's
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Je
n
s Le
h
mann
Add tests fo
r
the d
i
ff
.
i
gnoreSubmodul
e
s config opti
o
n
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehmann
Submodules: Use "ignore" settings from
.
gitmodul
e
s
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
J
e
n
s
Lehma
n
n
Submodu
l
es: A
d
d the
n
ew "ignore
"
config option
f
or
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-19
Je
n
s Lehm
a
nn
git s
u
bmod
u
le add: R
e
q
u
ire t
h
e new --force opti
o
n
to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-12
Jens
L
e
hmann
git add: A
d
d the
"--
i
gn
o
re-missing"
op
t
i
o
n for the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
Jens
Lehmann
Add
t
he option
"
--
i
gnore-submodu
l
es" to "git stat
u
s"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
Jens Lehmann
gi
t
s
ub
m
odule: ignor
e
dirty submodules for summa
r
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jen
s
Leh
m
ann
Add opti
o
n
al parameters to the dif
f
option "-
-
ignore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jens Lehmann
git di
f
f
: rename
t
est
t
hat had a c
o
nflicting nam
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-17
Je
n
s
Lehmann
gitk: Display dirt
y
s
ubmodules correctly
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Teach diff --submodule and
status to handle
.
git
files
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens
L
ehman
n
L
e
t c
h
e
c
k_preimage() us
e
memse
t
() to in
i
t
i
alize "s
t
r
u
ct
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-20
Jens Lehmann
gitk: Add Ctrl
-
W sho
r
tcut fo
r
closing the activ
e
window
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-14
Jens Lehmann
git s
t
atu
s
: igno
r
ing un
t
racked files m
u
st appl
y
t
o
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehman
n
git status: F
i
x false p
o
si
t
ive "new commits" output
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
Jens L
e
hmann
Refact
o
r
dirty subm
o
dule detection in diff-lib
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-10
Jens
Lehm
a
nn
git submodule
summ
a
r
y: H
a
ndle
H
EAD a
s
argum
e
nt when
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-08
Jens Lehmann
git status: Show det
a
il
e
d d
i
rty status of submodules
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-05
Jens Le
h
mann
git diff --submodule:
Sh
o
w
detailed dirty stat
u
s
of
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-02-01
Jens Lehmann
Updates
f
or dirty submodules in r
e
lease notes
and user
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-31
J
e
ns
L
eh
m
ann
Fix me
m
ory
leak in subm
o
dule
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-28
Jens Leh
m
a
nn
gi
t
-gui: Qu
o
te git path when
s
tartin
g
another gui
i
n
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Jens Leh
m
ann
Teach d
i
f
f --submod
u
le that modified
s
ubmod
u
le dir
e
ctory
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Je
n
s Lehmann
git
d
iff
:
Don'
t
test
s
ub
m
odule dirti
n
e
s
s with --ignore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens
Lehmann
git-gui:
A
dd
a special di
f
f popup menu for s
u
b
m
o
dules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens Lehmann
git-gui: Use git dif
f
--subm
o
dule w
h
e
n
a
vailable
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens Le
h
mann
git-
g
ui: Co
r
rect fil
e
_states when unsta
g
in
g
pa
r
tly
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-19
J
ens Lehmann
P
e
r
f
o
r
mance o
p
timization
f
or det
e
ct
i
on of m
o
dif
i
ed
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jen
s
Lehmann
g
it status: Show uncommitted submod
u
l
e
c
h
anges too
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jens
L
e
hmann
Show submodules as
modified when they contain a
d
irty
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
Jens
L
ehmann
gitk: U
s
e the --submodu
l
e option f
o
r dis
p
laying
diffs
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
Jens Le
h
mann
gitk:
Fix diffing committed -> stag
e
d (typo in diffcm
d
)
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-10-24
Jens L
e
hmann
a
dd tests for git diff -
-
submo
d
ule
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-25
Jens Lehmann
git-gui: fix use of uninit
i
a
l
i
zed va
r
iable
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-22
Jens Le
h
m
a
nn
git
submod
u
le add: make the <path> param
e
ter optional
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-27
J
ens Leh
m
ann
git-gui: fix diff for partially staged submodule changes
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-15
Jens L
e
hmann
git submodul
e
summary
:
add --
f
ile
s
option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-10
Jens Lehmann
git-gui:
d
isplay summary when showi
n
g
dif
f
of
a
submodule
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-05
Jens L
e
hm
a
nn
Documen
t
ation: git
submodule:
add mis
s
ing options t
o
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-08
Jens Lehmann
g
it
-
gui: run post-checkout
h
ook after clon
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Je
n
s Leh
m
ann
git-
g
ui:
r
u
n post-checkout hoo
k
on check
o
ut
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Jens Lehmann
gi
t
-
g
u
i: When callin
g
po
s
t-commit ho
o
k
w
rong variable
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-22
J
e
ns Lehmann
githooks
d
o
c
u
m
entatio
n
: p
o
st-checkout
hook is also
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-20
Je
n
s
L
ehmann
git-gui
:
Fix merge c
o
n
flict
display erro
r
whe
n
fil
e
nam
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree