repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jh/maint-do-not-track-non-branches' into maint
2011-02-22
Clemens
B
uchacher
do no
t
o
ver
w
rite untrack
e
d
s
y
m
links
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-02-22
Clemens Buc
h
ache
r
Documen
t
ation: clarify -u<
m
ode> option de
f
aul
t
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Cl
e
mens Bucha
c
her
us
e
persistent memory fo
r
rejected
paths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clem
e
ns Bucha
c
her
do
n
o
t
overwrite f
i
les in
l
e
ading p
a
th
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens
Buchacher
lstat_cache: o
p
ti
o
nally return mat
c
h_len
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Cle
m
ens Buchacher
add
func
t
ion check_ok_to_remo
v
e()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buchacher
t7607
:
add lea
d
i
n
g-path tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buchacher
t
7
607: use test-lib fun
c
tions and
check
MERGE
_
H
EAD
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
Clemens
Buc
h
acher
us
e
persiste
n
t m
e
mory
f
or rejected
p
aths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
Clemens Buc
h
ac
h
er
do not
overwrite un
t
racked during
m
erge from unborn
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
C
l
eme
n
s
B
uch
a
cher
do
n
o
t
overwrite files in leadi
n
g path
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemen
s
Buchacher
lsta
t
_cache:
o
pt
i
onally return mat
c
h_
l
e
n
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens B
u
chache
r
ad
d
fu
n
ction
c
heck_ok
_
to_r
e
m
ove()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Buc
h
acher
t7607: add leading-path tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Cle
m
ens
Buchache
r
t
7607: use test-lib
f
unctions and
chec
k
MERGE_HEA
D
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
C
l
e
m
ens Buchac
h
e
r
do not
sea
r
ch functions for patch ID
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Clemens Bu
c
ha
c
her
ad
d
rebase patch id tes
t
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-08-17
Clemens Buchac
h
er
hash bina
r
y sha1 i
n
to
patch id
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Clemens Bu
c
h
a
ch
e
r
l
s
-fi
l
es: allow
r
e
lative paths
p
ec
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Clemens Buchac
h
er
quote
.
c: sep
a
ra
t
e quoting
a
nd relative path ge
n
eration
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
C
l
emens Buchacher
get_c
w
d_rel
a
tive
(
): do not
m
isinterpret suffix
a
s
subdirect
o
r
y
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-25
Clemens Buchacher
test get_
g
it
_
work_tr
e
e() return
value for NULL
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-08
C
lemens
B
u
c
h
ach
e
r
Documentatio
n
: git-ad
d
d
oes not update
f
i
les m
a
rked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-01
C
lemens B
u
chach
e
r
do no
t
o
v
erw
r
ite
files
m
arked
"assu
m
e unchanged
"
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-12-05
Clemens Buchacher
git-gui: search
4 directories
t
o
i
m
prove statis
t
ic
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-11-05
Clemens B
u
chacher
set ht
t
pd
p
or
t
before sourcin
g
l
i
b
-httpd
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-31
Clemens Buchac
h
er
rem
o
te-h
e
l
pers: ret
u
rn successfully i
f
e
v
e
r
ythin
g
up
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-21
Clemens B
u
c
hacher
m
o
dernize fetch/m
e
rge/pull
e
xam
p
les
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-17
Clemens Bu
c
hacher
cvs
:
in
i
t
ialize emp
t
y pa
s
sword
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
Clemens Buchacher
t
est
local clo
n
e
by copying
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
Cle
m
ens Buchac
h
e
r
prese
r
ve m
t
ime of local clone
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Clemens
B
uc
h
acher
grep: accept rel
a
tive paths outs
i
d
e
c
urrent wo
r
king
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Clemens Buchacher
grep
:
f
i
x
ex
i
t status if external_
g
r
e
p() punts
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-18
C
l
emens
B
u
c
hac
h
er
fetch:
d
o not create r
e
f from
emp
t
y
name
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clem
e
ns B
u
chacher
test-lib: fix
h
t
tp ex
i
t co
d
e
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
C
l
emens
B
ucha
c
h
er
tes
t
-li
b
: allow ex
i
t trap to be
used for cleanup by
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buchache
r
tes
t
-l
i
b: fai
l
if invalid
options are passe
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buchache
r
refuse to merge during a me
r
ge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Cle
m
ens Buch
a
c
her
m
a
tch_
r
e
f
s: search ref list ta
i
l
internally
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-31
Clemen
s
B
uchacher
http-push: reuse existin
g
is_null_ref
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Cl
e
me
n
s Buchacher
fix segfa
u
lt showing
a
n empty remote
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
s
i
m
plify
o
utput of confl
i
cting merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clem
e
ns Buchacher
u
p
d
a
t
e cach
e
for
conflict
i
ng
s
u
bmodule
e
nt
r
ies
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Bu
c
hac
h
er
ad
d
tests for merg
i
ng with s
u
bmodules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
C
l
emens
Buchacher
remove pathspec_m
a
t
c
h, use match_pathspec i
n
stead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Clemens Buchacher
clean up pathspec
matching
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens Bu
c
hacher
unpack-tr
e
es: remove re
d
un
d
ant
p
a
t
h se
a
r
c
h
i
n
ver
i
fy_absent
commit
|
commitdiff
|
tree
2009-01-05
Cle
m
ens Buchacher
unpack-tre
e
s:
fix pa
t
h
s
earch bug in verify_ab
s
ent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchache
r
un
p
ack-trees: handle failure in
verify_absen
t
commit
|
commitdiff
|
tree
2008-12-15
Clem
e
ns Buc
h
acher
modify/del
e
te con
f
lict resolution overwrites untrac
k
e
d
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Cl
e
mens Buchacher
push: fix local refs upd
a
te if a
l
ready up-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchacher
do n
o
t
f
orce writ
e
o
f packed refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Cleme
n
s Bucha
c
her
clone: fix creation of exp
l
icitly named
target dir
e
c
t
or
y
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Cle
m
ens Buc
h
a
che
r
git gui: show diffs with a minimum
o
f
1 context
l
in
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens Buchacher
http-
p
ush
:
remove
remote locks
o
n
e
x
it signals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
C
l
emens Buchacher
Re
s
et the signal bein
g
handle
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
C
l
e
m
ens Buchacher
merge-r
e
cursive: h
a
nd
l
e
file mode changes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Bucha
c
her
http-p
u
s
h
: add
r
egression test
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Bu
c
hacher
h
ttp-push: p
u
sh <remote> :<branch> delet
e
s
r
emote bran
c
h
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree