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
Merge branch 'js/hp-nonstop'
2012-10-29
Jen
s
L
ehmann
submodule statu
s
: remov
e
unused orig_* va
r
iables
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
Jens Lehmann
submodul
e
add: Fail when
.
git/mo
d
ules/<na
m
e> alrea
d
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
Jens
L
eh
m
ann
Teach "g
i
t
submo
d
ule
add" the --name opti
o
n
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-29
Jens
L
ehmann
submod
u
le: teach rm to remove subm
o
dules unl
e
ss they
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-03
Jens
Lehman
n
submodule
:
us
e
arg
v
_array inst
e
a
d of hand-building
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-07-12
Jens Le
h
mann
submodules: don'
t
stumble o
v
e
r
symbolic links
when
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-29
Jens
L
ehmann
submodules:
print "re
g
i
s
t
ered for path" message
o
nly
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-20
Jens
L
ehmann
Co
n
siste
n
t
l
y use "supe
r
project
"
i
nste
a
d of "
s
u
pe
r
module"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-04-14
Je
n
s Lehman
n
submodules: r
e
cursive fetch
a
l
so
c
hecks new tags fo
r
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Jens Lehmann
submodule
s
:
refact
o
r computation of relative git
d
ir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Jens Lehmann
submo
d
u
l
e
s
: a
l
w
a
ys u
s
e a re
l
ative path fr
o
m g
i
tdir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
J
e
ns Lehmann
submod
u
le
s
: alwa
y
s use a rel
a
t
i
ve
p
ath to
g
itdir
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-24
J
e
n
s Leh
m
ann
submodule add: fix breakage when re-add
i
ng a deep submodu
l
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-17
Jens Lehmann
test
-
lib: ad
d
the test_
p
au
s
e convenience func
t
io
n
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-03
Jen
s
Lehma
n
n
docs: descri
b
e behavior of relat
i
ve sub
m
odule URLs
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-12-08
Jens Lehmann
diff/status: p
r
int s
u
bmodule path when lookin
g
f
o
r
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-09-09
Jens L
e
hm
a
nn
fetch: s
k
ip on
-
demand
ch
e
cking
whe
n
n
o
sub
m
odules are
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-08-01
Jens Lehman
n
Documentation/submodule
:
add c
o
m
mand r
e
fere
n
ces and
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-28
Jens Lehma
n
n
submod
u
le: update and a
d
d m
u
st h
o
nor --quiet flag
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-24
Jens Lehm
a
n
n
tests: print failed test
n
umbers at t
h
e end o
f
the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-26
J
e
ns Lehmann
s
ubmodule add: always in
i
t
i
alize
.
git/
c
on
f
ig
entry
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-20
Jens Lehma
n
n
fetch: Also
fetch submodule
s
in subdirectories in
on
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Je
n
s Le
h
mann
submodu
l
e
ad
d
: cle
a
n up duplicated code
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jens Lehma
n
n
submodule add: allow
re
l
ative repository path even
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jens Le
h
mann
submo
d
ule add:
te
s
t fa
i
lure when url is no
t
configu
r
ed
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
Jens Lehmann
Teach read-tree the -n|--dry-run option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
Jens
L
e
h
man
n
unpa
c
k-trees: add the dry_
r
un flag to unpack_trees_options
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-14
Jen
s
Leh
m
ann
Submodules:
D
on't
parse
.
gitmodules when it contains
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-28
Jens
Leh
m
ann
tests: fix overeager scrubbing of environment variables
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehm
a
nn
fet
c
h
/pull: Describe -
-
r
e
c
urse-sub
m
odule re
s
tricti
o
ns
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
J
ens Lehmann
s
u
bmodul
e
update: Don't fetch when the submodule
commit
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens L
e
hmann
fetch/pull: Don't recurse i
n
t
o a
sub
m
odule when co
m
mits
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
J
e
ns Lehma
n
n
Submodules: Add 'o
n
-demand' val
u
e for th
e
'fetchR
e
curseSubmo
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
con
f
ig: teach the f
e
t
c
h
.
r
e
curseSu
b
modul
e
s opti
o
n
the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
J
ens
Lehman
n
fetch/pull: Add the 'on-demand' value to
t
he --recurse
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
fetc
h
/pull: recurse into submodule
s
when n
e
cessary
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-02-07
Jens Le
h
m
a
n
n
p
u
ll: Document the "--[n
o
-]re
c
urse
-
su
b
modules" options
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-01-31
Jens Lehma
n
n
t5526
:
Fix wrong
a
rgume
n
t or
d
e
r
i
n "git co
n
fig"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-12-07
Jens Lehmann
git su
b
module
:
Remove now obsol
e
te te
s
ts befo
r
e cloning
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens Lehm
a
nn
Submodul
e
s: Add the "fetchRecu
r
se
S
ubm
o
dules
"
config
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
J
e
n
s Lehm
a
nn
A
d
d the 'fetch
.
recurseSubmodules' config
se
t
ting
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens Lehmann
f
e
t
c
h
/pull: Add the --re
c
urse-s
u
bmodules option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-05
Jens Lehmann
clone: Add the -
-
recurse-s
u
bmodules option as alias
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-03
J
e
ns
L
ehmann
pull: Remove
-
-
t
ag
s
option
from manpag
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-09
Jens Leh
m
ann
t1020: G
e
t rid of 'cd "$HERE"' at the start of each
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
S
e
v
eral tes
t
s: cd inside subs
h
ell instead of
around
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
J
e
ns
L
e
h
m
ann
t3404 &
t
7508:
c
d
ins
i
de subshell inst
e
ad
o
f a
r
ound
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
J
e
ns
Lehma
n
n
t5505
:
add missing &&
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
Jens L
e
hmann
t7
4
06 & t7407: a
d
d
missing && at end
o
f li
n
es
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t
7
405:
cd in
s
ide subshell instead of
aro
u
n
d
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
Jens Lehmann
checkout: Use
s
u
bmodu
l
e
.
*
.
ignore s
e
ttin
g
s from
.
gi
t
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
J
e
ns L
e
hmann
checkout: Add test for diff
.
i
g
noreSubmodules
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
J
e
ns Lehmann
Add
tests for the
diff
.
ignore
S
u
b
m
o
d
u
l
es con
f
ig opt
i
on
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
J
e
ns
Leh
m
ann
Submodules: Use "
i
gnor
e
" s
e
tt
i
ngs from
.
git
m
odules
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
J
ens
Lehmann
Submodule
s
: Add the new "i
g
nore" config optio
n
for
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-19
Je
n
s Lehma
n
n
git
s
ubmodu
l
e
add: Require the new --force option to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-12
Je
n
s Lehmann
git add
:
Add t
h
e "--i
g
n
o
r
e-missi
n
g" o
p
t
i
on for th
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
Jen
s
Lehmann
Add
t
he opt
i
on "--ignore-s
u
bmodules" to "git status"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
J
ens Lehmann
git su
b
module: ignore dirty submodul
e
s
f
o
r s
u
mmar
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jens Lehman
n
Add optional p
a
rameters to the
diff optio
n
"--ignore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jens Lehmann
git diff: rename
t
e
st that
had a conflicting name
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-17
Jens Le
h
mann
gitk: Disp
l
ay dirty submodules corre
c
t
ly
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens
L
ehm
a
nn
Teach
di
f
f
--submodule and
s
tat
u
s to handle
.
git
fi
l
e
s
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens
Lehman
n
Let
check_preimage() use
mem
s
et() to initialize "struct
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-20
Jens Lehmann
gitk: A
d
d
C
tr
l
-
W
short
c
ut
f
or closin
g
the activ
e
window
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-14
J
ens Lehmann
git stat
u
s
:
i
g
n
oring un
t
racked fi
l
e
s m
u
st apply
t
o
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
Jens Leh
m
ann
git status: Fix false posit
i
ve
"new
commits" output
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
J
e
n
s
Lehmann
Refactor dirty s
u
bmodule d
e
t
e
c
t
i
on
in diff-li
b
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-10
J
e
n
s
L
e
hmann
git s
u
b
m
o
dule summary:
Ha
n
d
l
e H
E
AD
a
s
argument wh
e
n
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-08
Jens
Lehmann
git s
t
at
u
s: Show detail
e
d dirt
y
statu
s
of submodules
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-05
Jens Lehm
a
nn
g
it diff --submo
d
ul
e
: S
h
ow de
t
ailed dirty s
t
atus of
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-02-01
Jens
L
ehmann
Updat
e
s for dirty
s
ubm
o
dules in releas
e
notes
a
n
d
user
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-31
Jens Lehmann
Fix memory leak i
n
su
b
m
o
dule
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-28
Jens Lehmann
git-g
u
i:
Quo
t
e git p
a
t
h
when
star
t
in
g
another gui in
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Jens Leh
m
ann
T
each diff --submodule that modif
i
e
d submodule
d
irectory
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Jens Leh
m
ann
g
it diff
:
Don't te
s
t submodule dirtiness with --ignore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens
L
ehma
n
n
git-gui: A
d
d a special diff
popup menu for submodules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens L
e
hmann
git-gui: Use git di
f
f
--s
u
b
m
odule when a
v
ai
l
able
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens Lehm
a
nn
git-gui:
C
o
r
r
ect file
_
st
a
t
e
s
wh
e
n unstagi
n
g partly
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-19
Jens Lehmann
Performance o
p
timization for detection of modifi
e
d
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jens Lehmann
git status: Sh
o
w uncom
m
itted sub
m
odule c
h
a
nges to
o
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jens Lehmann
Show submodules as modified when they contain
a
dirty
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
J
ens
Lehmann
g
itk: Use the --
s
u
bmod
u
le option for dis
p
laying diffs
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
Jens
L
ehmann
g
itk: Fix diffing
c
ommi
t
t
e
d
-> staged (typ
o
in
d
iffcmd)
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-10-24
Jen
s
L
e
hmann
add te
s
t
s for git diff --s
u
bm
o
dule
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-25
Jens L
e
hmann
g
it-gui
:
f
ix use
o
f
uninitialized vari
a
ble
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-22
Jens
Lehmann
git
submodule add: make
t
he <path> parameter optional
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-27
Jens Lehmann
git-gui:
fix diff
for part
i
ally sta
g
e
d
submodul
e
changes
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-15
Jens Lehmann
gi
t
submodule su
m
mary: add --files o
p
tion
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-10
J
ens Le
h
m
a
nn
g
it-gui:
display summary when showing
dif
f
of a
s
ubmodule
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-05
Jens Lehma
n
n
D
o
c
umentation:
g
it
submodu
l
e:
add miss
i
n
g
options
to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-08
J
ens Lehmann
git
-
gui: run
p
os
t
-checkout hook
a
f
t
er c
l
on
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Jens
L
ehmann
g
i
t-gui
:
run
p
o
st-checko
u
t hook on checkout
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Jens
L
e
h
mann
git-gui: When calling post-co
m
m
i
t
ho
o
k wrong variab
l
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-22
J
e
n
s
Le
h
m
a
nn
githooks documentation: p
o
st-chec
k
out hook is
a
lso
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-20
Jens
Lehmann
g
i
t-gui: F
i
x m
e
rge conflict
display error
w
he
n
filename
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree