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 'jc/maint-combined-diff-work-tree' into maint
2011-08-01
Clemens Buchacher
notice error exit from pag
e
r
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-01
Clemens Buchacher
propagate --quiet to send-pack/rec
e
iv
e
-
p
ack
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-01
Clemens
B
uchacher
error_r
o
u
t
ine: use parent's stder
r
if ex
e
c
fails
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-02-22
Clemens Buch
a
cher
do
n
ot
overwrite unt
r
acked symlinks
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-02-22
Clemens B
u
cha
c
her
Document
a
tion: cla
r
ify -u<mode>
op
t
i
o
n
defaults
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buchach
e
r
u
se persistent memory for rejected paths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buchache
r
do not overwrit
e
f
i
les in leading
p
a
t
h
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens B
u
chacher
l
s
tat_c
a
che: optionally re
t
urn match_
l
e
n
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buchacher
ad
d
function check_ok_to_remo
v
e()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Cl
e
m
ens B
u
chacher
t7607: add leading-path tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
C
lemens Buchacher
t7607: use test-lib functions
a
nd check MERGE_H
E
A
D
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
Clemens Buchacher
use persiste
n
t
m
emory for rejected p
a
th
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
Cle
m
ens
Buch
a
c
h
er
d
o not overwrite
u
ntrac
k
ed du
r
ing merge
fr
o
m unborn
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Buchacher
do not
o
verwrite fil
e
s in leading pat
h
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens
Buch
a
che
r
lstat_cache:
o
ptionally re
t
urn match_len
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clem
e
n
s
B
uchacher
a
d
d functio
n
chec
k
_o
k
_to_remove()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Bu
c
hach
e
r
t7607
:
add lead
i
ng-path tes
t
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Bucha
c
h
e
r
t
7
607: use test-li
b
functions and check MERG
E
_HEAD
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Cl
e
mens Buchacher
do not search function
s
for patch ID
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Clemen
s
Buc
h
a
cher
add
r
ebase patc
h
id tes
t
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-08-17
Clemens Bucha
c
her
hash binary sha1 int
o
patc
h
id
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
C
l
e
m
e
ns B
u
chacher
l
s
-file
s
: allow relative pat
h
s
p
ec
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
C
l
emens Buch
a
cher
quote
.
c: se
p
arate quoting
and relative path
generation
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Cle
m
en
s
Buchach
e
r
s
e
tup: document prefix
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-28
Clemens Buchacher
get_
c
wd_relative(): do not misinterpret suffix
as subdi
r
ectory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-25
C
l
emens Buchacher
test get_git_w
o
rk_tree(
)
r
e
t
urn value for NU
L
L
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-08
Clemens Bu
c
hac
h
e
r
Documentati
o
n: git-add does not up
d
a
te fil
e
s marked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-01
C
lemens Buc
h
acher
do not
overwrite files marked
"
assume unchanged"
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-12-05
Clemens Buc
h
acher
git-g
u
i: search 4 directorie
s
to i
m
p
rove sta
t
istic
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-11-05
Clemen
s
Buchacher
set htt
p
d port before sou
r
cing lib-httpd
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-31
C
l
eme
n
s
B
u
c
hacher
remo
t
e-helpers: retur
n
s
uccessfully if
everything up
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-21
Clemens Bu
c
hac
h
er
moderni
z
e
f
etch/
m
erge/pull examples
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-17
Cle
m
e
n
s
Buch
a
cher
cvs
:
initi
a
liz
e
e
m
pty p
a
ssword
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
Clemens B
u
c
h
acher
tes
t
local clone by co
p
ying
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
Clem
e
ns Buch
a
cher
pre
s
erve mtime of
local clone
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
C
l
emens Bu
c
hacher
grep: accept relative
paths out
s
ide c
u
r
r
ent workin
g
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Clemen
s
Buchacher
grep: fix exit status
i
f ex
t
e
rnal_grep() punts
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-18
Clemens
Bucha
c
her
fetch:
d
o
not
c
reate ref
f
rom e
m
pt
y
name
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clem
e
n
s Buc
h
acher
test
-
l
i
b: fix http exit co
d
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buc
h
acher
test-lib: all
o
w exit t
r
a
p
to be used f
o
r cle
a
nup by
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
C
lemen
s
Buchacher
test-lib: fail if invalid
optio
n
s are
passe
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens
B
uchacher
r
e
fuse to
merge durin
g
a
merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Cleme
n
s Buchacher
match_refs: search ref list
tail in
t
ernall
y
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-31
Cl
e
mens Buchacher
ht
t
p-
p
u
s
h: reuse exi
s
ting is_null_ref
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Clemens Buchacher
fix segfault s
h
o
w
ing
a
n e
m
pty
remote
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cl
e
me
n
s
B
uchacher
s
i
mplify o
u
tput
o
f
c
onflic
t
ing merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Bu
c
hache
r
update cache for con
f
lictin
g
submodule ent
r
i
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cleme
n
s Buc
h
acher
a
dd
t
ests for merg
i
ng with submo
d
ules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
C
lemens
B
u
c
hacher
remove pathspec
_
match, use match_pathspe
c
instead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Cleme
n
s
Bu
c
hacher
clean up paths
p
ec
m
atching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchacher
unpack-trees: r
e
m
o
ve red
u
ndant pat
h
s
e
arch i
n
verify_
a
bse
n
t
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buch
a
cher
unpack-trees
:
fix path
s
ea
r
ch bug in verify_absen
t
commit
|
commitdiff
|
tree
2009-01-05
Cle
m
ens Bu
c
hacher
unpack-trees: h
a
ndle failure in ve
r
i
f
y
_
abse
n
t
commit
|
commitdiff
|
tree
2008-12-15
Cleme
n
s
B
u
c
hacher
modif
y
/dele
t
e
c
onflict resolution ove
r
wr
i
t
e
s un
t
racked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
C
l
emens Buchac
h
er
push:
fix lo
c
al
r
e
fs update if already up-to-dat
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchacher
d
o not f
o
rc
e
write of packe
d
refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Clem
e
ns Bu
c
hacher
clone: fix creation
o
f explici
t
ly nam
e
d target direc
t
ory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemens Buchacher
gi
t
gui: sho
w
di
f
f
s
w
ith a
minim
u
m of 1 context lin
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens
Buch
a
cher
http-push
:
remove remote locks o
n
ex
i
t si
g
nals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Bucha
c
her
Reset the signal being handled
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Cl
e
mens Buchac
h
er
merge-recursi
v
e: handle f
i
l
e
mode changes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buc
h
acher
http-
p
ush:
a
d
d
r
egression tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemen
s
Buc
h
acher
http-pus
h
: p
u
sh <remote
>
:<branch> d
e
l
e
tes r
e
mote br
a
n
ch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree