repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint' to sync with Git 1.7.3.3
2010-11-15
Clemens B
u
chacher
use persistent memory for
r
ejected p
a
ths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
Clemen
s
Buchacher
do n
o
t overwrite untra
c
ked during merge from unbo
r
n
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens
Buchacher
do not
o
verw
r
ite files in leading path
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
C
lem
e
n
s
B
uchacher
lstat_cache: optiona
l
ly
return match
_
len
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
C
l
emens
B
uchacher
add
function check_ok_t
o
_remov
e
()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Cle
m
ens Buch
a
cher
t
7
6
0
7: a
d
d leading-path tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Cleme
n
s Buchache
r
t7607: use test-lib functions and
chec
k
MERG
E
_H
E
A
D
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Clemen
s
Buchacher
d
o
not se
a
rc
h
fu
n
ctions for patch ID
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Clemens Buchache
r
add r
e
b
as
e
p
a
tch
i
d tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-08-17
Clemens Buchac
h
er
hash
bina
r
y sh
a
1 in
t
o patch id
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Clemens Buchacher
ls-files: a
l
l
o
w
rel
a
tive pathspec
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
C
lem
e
ns Buch
a
cher
quote
.
c:
s
e
parate quo
t
in
g
and relat
i
v
e path generation
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Clemens Buchacher
setup:
docume
n
t pre
f
ix
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-28
Clemens Buchache
r
get_cwd_re
l
ative(): do
not misi
n
ter
p
ret
s
uff
i
x as s
u
b
directo
r
y
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-25
Clemens
Bucha
c
her
test get_git
_
work
_
t
ree() return
v
a
lue
for
N
ULL
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-08
C
l
emens
B
uc
h
acher
D
o
cu
m
entati
o
n
: g
i
t-add
d
oes
n
ot update fi
l
es
m
ar
k
ed
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-01
Clemen
s
Buchacher
do no
t
overwrite fil
e
s marked "assume unchanged"
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-12-05
Clemens Buchacher
git-gui: search
4 directories to i
m
prove
s
tatistic
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-11-05
Clemen
s
Buchacher
set httpd port befor
e
sour
c
ing li
b
-h
t
t
pd
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-31
Clemens Buchacher
remote
-
helpers:
r
et
u
rn suc
c
essf
u
lly if eve
r
ythi
n
g
u
p
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-21
Clemens
B
ucha
c
her
modernize fetch/
m
erge/pull examples
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-17
Clemens Buchach
e
r
cvs: initialize em
p
ty
p
ass
w
o
r
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
Clemens Bucha
c
her
test
local
cl
o
ne
by c
o
p
ying
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
C
l
emens
Buchacher
preser
v
e mtime
o
f local clon
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Clemens Bu
c
hac
h
er
grep: accept relative pat
h
s outside curre
n
t work
i
ng
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Clemens Buchacher
grep:
fix e
x
it statu
s
if external_g
r
ep() pu
n
ts
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-18
Clemens Buchache
r
fetch: do not cr
e
a
te
r
e
f
f
r
om empty name
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buchacher
test-lib: fix
ht
t
p exit
c
odes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens
Buchacher
test-
l
ib:
allow ex
i
t tr
a
p to
b
e used fo
r
cl
e
anup
by
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clem
e
ns Buchacher
test-lib
:
fai
l
if
i
n
v
al
i
d options ar
e
p
a
ssed
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buchacher
refu
s
e to merge during a
m
erg
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Cl
e
m
e
ns Buchacher
mat
c
h
_refs: search ref list tail internally
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-31
Clem
e
ns B
u
chacher
http-push:
reu
s
e
existi
n
g i
s
_null_ref
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Clem
e
n
s
Bucha
c
h
er
fix segfault showing an empt
y
remote
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens
B
uchacher
s
implify outpu
t
of
confl
i
cting merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
C
l
e
m
ens Buchacher
update cache for c
o
n
f
licti
n
g submo
d
ul
e
e
n
tri
e
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Bu
c
hacher
add test
s
for m
e
rging wit
h
submodules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens
B
u
c
h
a
c
h
e
r
r
emove
pathspec_match, use match
_
pathspec ins
t
ead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Bu
c
hacher
clean up pathsp
e
c matchi
n
g
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemen
s
Buchac
h
er
unpac
k
-
trees: remove redundant path search in verify_absent
commit
|
commitdiff
|
tree
2009-01-05
C
l
emens
B
u
c
h
acher
unpack-trees: fix pat
h
search bug in verif
y
_absent
commit
|
commitdiff
|
tree
2009-01-05
Clemens B
u
chacher
unpack-tr
e
es: handle f
a
ilure
in verify_absent
commit
|
commitdiff
|
tree
2008-12-15
Clemens Buchacher
modi
f
y
/
d
e
lete
c
on
f
l
i
ct
r
esolution ov
e
rwr
i
tes untracked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buch
a
cher
push
:
fix lo
c
al refs update if already u
p
-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens B
u
chache
r
do
n
o
t force wri
t
e
o
f
packe
d
refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Clemens
B
uchacher
clo
n
e: fi
x
creation of ex
p
li
c
itly n
a
med target directory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemens Buchacher
git gui
:
show diffs with a
minimum of 1 context line
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Buchacher
http-push: remo
v
e remote
lo
c
ks on exit
sig
n
al
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Cle
m
ens
B
uch
a
cher
Reset the
s
ignal
b
ei
n
g ha
n
dled
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
C
lemens
Buchac
h
er
mer
g
e-
r
ecursive: h
a
ndle fi
l
e mode
c
h
an
g
e
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Cleme
n
s
Buc
h
acher
h
ttp
-
p
ush: add regre
s
s
i
o
n
tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchacher
http-push: pus
h
<re
m
ote>
:<branch
>
deletes remote b
r
anch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree