repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: never leave index unmerged while recursing
2009-04-05
Clemens Buchacher
simplify
o
u
t
put of conflict
i
ng m
e
rge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cl
e
mens
B
uchac
h
er
update ca
c
he for conflicting
sub
m
odul
e
ent
r
ies
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cl
e
mens
B
uchacher
add tests
f
or mer
g
ing with
submodules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchach
e
r
remove pathspec
_
m
at
c
h, use match_pa
t
hspe
c
instead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemen
s
B
uc
h
ache
r
clean up pathspec matc
h
i
n
g
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
C
l
e
mens B
u
c
h
acher
unpack-trees: rem
o
v
e
redundant path s
e
a
r
c
h
in verify_abs
e
n
t
commit
|
commitdiff
|
tree
2009-01-05
C
l
e
m
e
n
s
Buchacher
unpa
c
k-tree
s
: fix
p
ath sea
r
c
h bu
g
i
n
verify_
a
bsent
commit
|
commitdiff
|
tree
2009-01-05
Cle
m
en
s
Buchac
h
er
unpack-tree
s
: handle failur
e
in
verify_a
b
sent
commit
|
commitdiff
|
tree
2008-12-15
Cl
e
mens Buchach
e
r
modif
y
/
d
el
e
t
e
conflict resolution overwrites untracked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Cleme
n
s Bucha
c
her
push:
fix loca
l
refs u
p
dat
e
if
a
lread
y
up-to-dat
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens
B
uc
h
a
cher
do not force w
r
ite of packed refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
C
le
m
ens Buchacher
clone: fix creation
o
f explicitly named ta
r
get directory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemens Buc
h
acher
git gui: s
h
ow diffs with
a minimum
of 1 context line
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Cleme
n
s Buch
a
c
h
e
r
http-push: remove
r
emote locks on ex
i
t signals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Buch
a
ch
e
r
Rese
t
the s
i
g
n
a
l being handled
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Clemens
Buchacher
merge-recursive
:
handle file mode chan
g
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buch
a
cher
http-pus
h
:
a
d
d regress
i
on tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchache
r
http-push
:
pu
s
h
<remote>
:
<br
a
nch>
d
e
letes
r
e
m
ot
e
branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree