repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' into next
2011-02-22
C
lem
e
ns Bu
c
h
a
cher
do no
t
overwri
t
e
u
n
tracked symlink
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-02-22
C
l
emens B
u
chacher
Docu
m
e
ntation:
clarify -u<
m
ode> option defau
l
t
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buch
a
ch
e
r
us
e
persistent
m
emory
for rejected paths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buchacher
do not overwrite
f
iles in l
e
ad
i
n
g
path
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Bu
c
ha
c
her
lstat_cache:
o
pt
i
onally r
e
t
urn ma
t
c
h
_
le
n
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemen
s
Buchacher
a
dd function check_
o
k_to
_
r
emove()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buc
h
acher
t7607: add leading-path
t
ests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
C
l
emens Buchacher
t7607: us
e
test-lib functi
o
ns and chec
k
MERG
E
_HEAD
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
C
lemens Buchacher
use persist
e
n
t memory for reject
e
d paths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
C
le
m
ens Bu
c
h
a
cher
do not overwrite untr
a
cked during merge
from
u
nborn
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemen
s
Buchac
h
e
r
do n
o
t overwrite files in leading
path
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clem
e
ns
B
uchacher
lstat_cache: optionally return match_len
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Cl
e
mens Buchacher
add f
u
nction che
c
k_ok_to_
r
emove
(
)
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clem
e
ns Buchacher
t7607: add leadin
g
-path
tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Buch
a
cher
t7607: use test-lib
functions and
check MERGE_HE
A
D
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
C
l
e
mens Buchac
h
e
r
d
o
n
o
t s
e
arch fu
n
ctions fo
r
patch ID
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Clemens Buchacher
add reb
a
se patch id tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-08-17
Clemens Buchacher
h
ash
bina
r
y sha1 in
t
o patch id
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Cle
m
ens
Buchacher
ls-files: allow r
e
lative pathspec
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
C
lemens
Buchacher
quo
t
e
.
c: separate quoting
and
r
elative
p
a
th generat
i
on
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Clemens Buchacher
setup: document prefix
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-28
Clemen
s
Buchacher
ge
t
_cwd_rel
a
t
i
ve(): do not misinte
r
pre
t
su
f
f
i
x
a
s subdirectory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-25
C
l
em
e
n
s Buc
h
acher
test ge
t
_git_work
_
tree() retu
r
n value
for NULL
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-08
Clemens Bu
c
hacher
Documentation
:
git-add does not
u
pdate
f
iles marked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-01
Cle
m
ens Buchacher
do n
o
t overwrit
e
fil
e
s
marked "
a
ssume unchang
e
d"
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-12-05
Clemens B
u
chacher
git-gui: sea
r
ch 4
d
ir
e
c
t
or
i
es to improve statistic
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-11-05
C
l
emen
s
Buchacher
s
e
t ht
t
pd port before
sour
c
ing lib-htt
p
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-31
Clemens
B
uch
a
cher
remote-he
l
p
ers: re
t
urn successfully if e
v
erythi
n
g up
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-21
Clemens Bucha
c
her
mod
e
rnize fetch/
m
erge/pull exam
p
les
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-17
Clemens B
u
chacher
cvs: initialize empty
passwor
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
Cl
e
mens B
u
chac
h
er
tes
t
local clone by copy
i
n
g
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
C
l
emens B
u
cha
c
h
e
r
prese
r
v
e mtime of
loc
a
l clone
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Cleme
n
s B
u
c
h
a
c
h
er
grep: accept relative paths ou
t
side current
working
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Clem
e
ns Buchache
r
g
r
ep: fix exi
t
s
t
atus if
extern
a
l_grep() punts
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-18
C
l
e
m
e
ns Buchacher
fetch:
do not
c
r
eat
e
re
f
f
ro
m
empty na
m
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Cle
m
en
s
Bucha
c
h
er
test-lib: fix
h
ttp exit
codes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
C
le
m
ens
Buchacher
t
e
st-lib: allow e
x
it t
r
ap to be used for
cleanup
b
y
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clem
e
ns
B
u
chacher
test-lib: fail if invalid opt
i
ons ar
e
passed
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
C
l
emens Buchach
e
r
refu
s
e to merge d
u
ri
n
g
a merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buchacher
match_refs: sea
r
ch ref list tail int
e
r
n
all
y
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-31
Clem
e
ns Buchache
r
h
t
t
p-push: reuse ex
i
sting
is
_
null_ref
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Clemens
Buc
h
acher
fix
segfaul
t
sho
w
ing an emp
t
y remote
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cl
e
mens Buc
h
a
cher
simplify
outp
u
t o
f
c
onfl
i
cting mer
g
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
up
d
a
t
e cache
for co
n
flicting submodu
l
e entr
i
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchac
h
er
ad
d
tests for merging
wit
h
s
u
bm
o
dule
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buc
h
a
c
he
r
remove paths
p
ec_matc
h
,
use match_pathspec inst
e
ad
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Cle
m
ens Buchacher
c
l
ean up pathspec matching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchacher
unpack
-
trees: remove redu
n
dant pa
t
h s
e
arch i
n
ve
r
i
f
y_a
b
sent
commit
|
commitdiff
|
tree
2009-01-05
C
l
e
m
ens Buchacher
unpack-trees: fi
x
pa
t
h sea
r
ch
b
u
g
i
n verify_absent
commit
|
commitdiff
|
tree
2009-01-05
C
lemen
s
Buchacher
u
npack-tr
e
e
s:
h
andle failure
i
n veri
f
y_
a
bsent
commit
|
commitdiff
|
tree
2008-12-15
Clemens Buchacher
modify/delet
e
confli
c
t re
s
olution overwrites untracked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchacher
push
:
fix local refs update if al
r
ead
y
u
p
-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Cleme
n
s
Buc
h
a
c
her
do not force writ
e
of pac
k
ed refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Cl
e
mens
B
u
c
h
acher
clone:
f
ix cre
a
tion of e
x
plicitly named target direct
o
ry
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemens
Buchacher
git gui: show diffs with a mi
n
imum of
1
context line
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Bucha
c
h
e
r
http-
p
ush: remo
v
e remote l
o
c
ks
o
n exit
s
i
g
n
als
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Buchacher
Reset the signal be
i
ng ha
n
dled
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
C
lemens Buchacher
merge-recursive: handle file mode
c
hanges
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Cl
e
me
n
s Buchacher
h
ttp-push
:
add regressio
n
tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Cl
e
mens
Buchacher
http-p
u
sh: push
<remote> :<b
r
anch> deletes
r
e
m
ote
branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree