repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pw/p4-various-fixes'
2012-11-24
J
e
n
s
Lehmann
T
e
ach rm to remove sub
m
odules when given with a t
r
ailing '/'
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-10-29
Jen
s
Lehmann
submodule status:
remove unused ori
g
_* variables
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
Jens L
e
hmann
submodule add: Fail
w
hen
.
gi
t
/
m
od
u
les/<na
m
e
> already
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-30
J
ens Leh
m
ann
Teach "git
s
ubmodule add" the --n
a
me
o
pti
o
n
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-29
Jens Lehm
a
nn
submodule
:
teach rm t
o
r
emove
s
ubm
o
dules un
l
ess t
h
ey
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-09-03
J
ens Lehmann
submod
u
l
e
: use argv_a
r
r
ay in
s
tead of hand
-
build
i
ng
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-07-12
Jens Lehmann
submodules: don't s
t
umble ov
e
r sy
m
bolic
l
inks when
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-29
Jens Lehmann
submodul
e
s:
p
rint "register
e
d for path" message on
l
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-05-20
J
e
ns
L
ehmann
C
o
n
s
istent
l
y use "superpro
j
ect" inste
a
d
of "supermodule"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-04-14
J
e
n
s
Lehmann
sub
m
o
d
u
les:
r
ec
u
rsive fetch
a
l
s
o
c
hecks new tags f
o
r
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Je
n
s
Leh
m
ann
submodu
l
es:
r
efactor co
m
pu
t
ation o
f
r
ela
t
ive gitdir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Jen
s
Lehmann
submodules: alway
s
us
e
a
relative
pa
t
h fro
m
gitdir
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-03-05
Jen
s
L
ehmann
s
u
bmodule
s
: always use a
r
elative path to gitdir
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-24
J
e
ns Lehmann
submodule ad
d
: fix brea
k
age
wh
e
n re-adding a deep
su
b
module
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-17
J
ens Lehmann
t
e
s
t-lib: a
d
d
the test_pause convenience function
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2012-01-03
Jens
L
ehm
a
n
n
d
ocs:
d
e
scribe beh
a
vior of
r
el
a
tive submodule URLs
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-12-08
Jens
Lehman
n
diff/sta
t
us: p
r
int submodu
l
e path when looki
n
g for
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-09-09
Jen
s
Lehma
n
n
fetch
:
s
k
ip on-d
e
mand chec
k
ing whe
n
n
o submo
d
ules are
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-08-01
Jen
s
Lehmann
Do
c
u
menta
t
ion/s
u
bmod
u
le: a
d
d comm
a
nd references and
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-28
Jens
L
ehmann
submodule: update and add mus
t
hon
o
r --quiet
flag
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-07-24
Jens Lehmann
tests: print failed test numbers
a
t the end of the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-26
Jens Leh
m
ann
submodule add:
al
w
ays initia
l
iz
e
.
git/config entr
y
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-20
Jens Lehman
n
fe
t
ch:
Al
s
o
fetch
s
ubmodules in subdi
r
ectories in on
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jens Lehmann
submodule add: cle
a
n up dup
l
icated
c
o
d
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Je
n
s Lehmann
su
b
module add:
allow relative re
p
ository path ev
e
n
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-06-06
Jen
s
Lehmann
s
u
bmodule a
d
d: test failure when
url is not configured
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
J
e
ns Lehmann
Te
a
ch read-tree the -n|--dry-run option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-25
Jens Lehmann
unpack-trees: add the dr
y
_ru
n
flag to u
n
pack_trees_options
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-05-14
Jens Lehman
n
Submodules: Don
'
t parse
.
gitm
o
dules whe
n
it
contains
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-28
J
e
ns Lehmann
tests: fix overeager scrubbing of
env
i
ron
m
e
nt
v
ariables
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jen
s
Lehman
n
f
etch/pull: Describe
--recurse-submodule restric
t
ions
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens
Lehmann
submodule up
d
ate: Don't fetch when the submodule commit
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Je
n
s L
e
hmann
f
etch/pull: Don't recurse int
o
a
submodule when commits
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
Submodules: A
d
d 'on-demand' val
u
e for the
'
fetchRecurseSubmo
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jen
s
Lehmann
c
onfig
:
teach th
e
f
e
tch
.
recurse
S
ubmodules option the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jen
s
Lehman
n
fetch/pull: Add the 'o
n
-demand'
val
u
e t
o
t
h
e --recu
r
se
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-03-09
Jens Lehmann
fetch/
p
ull: recurse into submo
d
u
l
es when nece
s
sary
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-02-07
Jen
s
Lehm
a
nn
pull: Document the "--[no-]recurse-submodules" options
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2011-01-31
J
ens
Lehmann
t
552
6
: Fix
wro
n
g argument order in "git config"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-12-07
Jens Lehmann
git su
b
mod
u
le: Remov
e
now ob
s
o
l
ete tests before
c
lonin
g
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jen
s
Le
h
m
ann
S
u
bmod
u
l
es: Add th
e
"
fetch
R
ecurseS
u
b
modules" confi
g
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens Lehmann
A
dd t
h
e 'fet
c
h
.
recurseS
u
bmodules'
co
n
f
i
g
s
etting
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-12
Jens Lehmann
fetch
/
pull: Add the
-
-
r
e
cur
s
e-submodule
s
option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-05
J
e
ns Lehmann
cl
o
n
e: Ad
d
th
e
--recu
r
se-submodules option as alias
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-11-03
J
ens Lehma
n
n
p
ull: Remo
v
e --tags opt
i
on f
r
om manpage
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-09
Jens Lehmann
t
1
02
0
:
Get rid
of 'cd "$HE
R
E
"
' at the start of each
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
Several te
s
t
s: cd inside subs
h
el
l
in
s
tead of
around
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
t3404 & t75
0
8
:
cd ins
i
de subsh
e
ll i
n
stead of aro
u
n
d
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-06
J
e
ns Lehmann
t5505: add
missing &&
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
Jens Leh
m
ann
t7406 &
t
7407:
add missin
g
&& at end of lines
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-09-03
J
e
ns Lehmann
t7
4
05
:
c
d
i
nsi
d
e subshell
in
s
tead of
ar
o
und
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
Jens Lehmann
checkout: Use submod
u
le
.
*
.
ign
o
re settings from
.
git
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-30
Jens
L
ehmann
checkout:
A
dd te
s
t f
o
r diff
.
ignoreSub
m
odules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-22
Jens Leh
m
ann
t7403: add mis
s
i
ng &&'s
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Jens Lehma
n
n
Add tests fo
r
the
d
i
f
f
.
ignoreSubmodu
l
es config
option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Jens L
e
h
man
n
Su
b
module
s
: Us
e
"ignor
e
" sett
i
ngs f
r
om
.
gi
t
m
o
dules
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-08-09
Jens Le
h
mann
Subm
o
dules: A
d
d the new "ign
o
re"
config option
f
or
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-19
Jens L
e
hmann
gi
t
submodule add: Require
t
he new --force option to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git add: A
d
d the "--ignore-
m
issing" opti
o
n
for
the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
Jens Lehmann
A
d
d th
e
option "--ig
n
ore-su
b
m
o
dules" to "git sta
t
us"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
J
ens Lehmann
git submodu
l
e: igno
r
e di
r
ty subm
o
dule
s
for summary
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
J
e
ns Lehmann
Add
o
ptional pa
r
a
meters t
o
the diff option "--ignore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jens Lehmann
g
i
t diff
:
r
ename test that had
a
conflict
i
ng name
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-17
Jens Leh
m
ann
gitk: Display dirty s
u
bmodules correctly
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehma
n
n
Teach diff -
-
s
ubmodule a
n
d sta
t
us to handle
.
git files
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
L
et
c
heck_preimage(
)
use memset() to in
i
tialize "struct
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-20
Jens L
e
hmann
gi
t
k:
Add Ctrl-W s
h
ort
c
u
t
for
c
l
osing the active
wind
o
w
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-14
J
ens Lehmann
git status:
igno
r
ing untracked f
i
les must apply to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
J
e
ns
L
ehmann
git status
:
Fix fa
l
se
p
ositiv
e
"ne
w
commits" output
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehman
n
R
efactor dirty
s
u
bmodule detection in diff-lib
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-10
Jens
L
ehma
n
n
git submodule summar
y
: Handle HEAD as argument when
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-08
Jens Le
h
mann
git status: Show d
e
tailed dirty
s
tatus of
s
ubmodu
l
es
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-05
Jen
s
L
ehmann
git diff
-
-submodule:
S
h
ow detailed dirty status o
f
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-02-01
J
ens Lehmann
Updates
for di
r
ty su
b
m
o
dules in
r
e
l
e
a
s
e note
s
and us
e
r
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-31
J
e
ns Lehman
n
Fix memory leak in submod
u
le
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-28
Jens Lehmann
git-gu
i
: Quo
t
e git pa
t
h
w
hen
startin
g
another gui in
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Jens Le
h
ma
n
n
Teach diff --
s
ub
m
odule that
m
o
d
i
fied submodu
l
e direct
o
ry
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Je
n
s Lehmann
git dif
f
: Don't test submodule dir
t
iness with --ig
n
ore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Je
n
s Lehmann
git-gui: Add a s
p
ecial di
f
f popup menu for
s
ubmo
d
ules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Je
n
s Lehman
n
git-g
u
i
:
Use git di
f
f --submodule wh
e
n avai
l
able
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jens Lehmann
git-gui: Correct file_states when unstaging pa
r
tly
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-19
Jens L
e
hman
n
Performance opti
m
ization for de
t
ection o
f
modifie
d
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
J
e
ns Le
h
mann
g
it status: Show uncommi
t
ted submodule changes too
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jens Lehmann
S
how s
u
bm
o
dules as m
o
dified when they contain
a
dirty
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
Jens
L
e
hma
n
n
g
itk
:
Use the --sub
m
odule option for displayin
g
d
iffs
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
Jens Le
h
mann
gitk: Fix
diffing committed -> sta
g
ed
(ty
p
o i
n
d
iffcmd
)
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-10-24
Jens Le
h
mann
add tes
t
s for git di
f
f
-
-su
b
module
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-25
J
e
ns L
e
hm
a
nn
git-gui
:
f
i
x
use
o
f uninitialized va
r
iabl
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-22
Jens L
e
hma
n
n
gi
t
subm
o
dul
e
ad
d
: make
the <path>
p
a
r
ameter op
t
ional
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-27
Jens Lehmann
g
i
t-gui:
fix d
i
ff f
o
r par
t
ially sta
g
ed submodule changes
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-15
Jens Lehmann
git submodule summary: add --
f
iles option
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-10
Jens Leh
m
ann
git-gui: display summar
y
w
hen
s
howing
dif
f
of
a
s
ub
m
odule
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-05
Jens
L
ehmann
Documen
t
ation: git submodule: add missing options to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-08
Jens Lehmann
git-gui:
r
un post-checkout hoo
k
af
t
e
r clone
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Jen
s
Le
h
mann
g
i
t-gui: run post-c
h
eckout
h
o
ok on checkout
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
J
en
s
Lehmann
git-gui: When c
a
lling po
s
t-comm
i
t hook
wrong variable
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-22
Jen
s
Leh
m
a
nn
g
it
h
ook
s
do
c
ume
n
tati
o
n:
p
o
s
t-checkout ho
o
k is also
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-20
Jens Lehmann
git
-
gui: Fix merge con
f
lict display error when filename
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree