repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge overwrites unstaged changes in renamed file
2012-04-16
Clemens Buchacher
m
er
g
e over
w
rites unstaged change
s
i
n renamed file
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-03-05
Clemens Buchacher
http
.
proxy
:
a
lso mention h
t
tps_
p
roxy and a
l
l_p
r
oxy
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-02-13
Clemens Buchacher
do
n
o
t override recei
v
e
-pack er
r
o
r
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-02-13
Clemens Buchacher
t554
1
: check error
me
s
sage against the real po
r
t number
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-02-13
C
lemens Buchach
e
r
push/fetch/clone --no-progress suppre
s
s
e
s progress
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-02-13
C
leme
n
s Buchacher
git rev-
l
i
s
t
:
fix invalid
t
ypecast
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
Clemens B
u
cha
c
her
git
-
d
aemon
tests
:
w
ai
t
unt
i
l da
e
mon is ready
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
Clemens Buchacher
git-daemon: pr
o
duc
e
out
p
ut
w
hen ready
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
Clemens Buch
a
cher
git-daemo
n
: add
tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
C
lemen
s
Bu
c
ha
c
her
dashed
externals:
k
il
l
children on
e
xit
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
Clemens Buchacher
credentia
l
s: un
a
b
l
e to conne
c
t
t
o
c
a
che daemon
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
Cl
e
m
e
ns Buchacher
fix push --quiet: add 'quiet' capabil
i
ty
to receive
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-04
Cleme
n
s Buchacher
t5550:
r
epack ev
e
rything into
o
n
e
fil
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-01
Cle
m
e
n
s
Buchacher
D
ocum
e
n
tati
o
n:
re
a
d-tree --prefix w
o
rks wi
t
h existing
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-10-17
C
lemens Buchacher
use test number as port number
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-10-05
Cle
m
ens
Buchacher
us
e
-h f
o
r
s
yn
o
psis
a
nd --help for manpage
c
onsis
t
ently
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-09-13
Clemens
B
uchacher
send-em
a
il: ad
d
option -h
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-09-12
Clemens Buchacher
r
e
name pathspec_prefix()
to common_prefix(
)
and move
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-09-06
Clemens Buch
a
cher
remove prefix
a
rgument from pathspec_prefix
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-11
Clemens Buchacher
l
s
-files
:
fix pathspec display on error
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-02
Cleme
n
s Buchacher
commit
:
a
l
l
ow parti
a
l commits
w
it
h
relative
p
aths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-01
Clem
e
n
s
Buchacher
n
otice er
r
or exit
f
rom pager
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-01
Clemens Buchacher
pr
o
pagate --quiet to
s
end-pack/receive-pack
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-01
Cle
m
ens
B
uchacher
error_r
o
utin
e
: u
s
e parent's stderr
if exec f
a
i
ls
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-02-22
Cleme
n
s Buc
h
ac
h
er
do not
o
ve
r
write
u
n
t
rac
k
ed sym
l
i
n
ks
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-02-22
Cl
e
m
en
s
Buchacher
Documentation:
cl
a
rify
-u<mod
e
> op
t
ion defaults
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
C
lemens Bucha
c
her
use persist
e
nt mem
o
ry
f
or rejected paths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Cle
m
ens Buchacher
do
n
ot
overwrite fi
l
es in leading path
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
C
l
emens
Buchacher
lstat_cach
e
: optionally return match_len
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens
Buchache
r
add functi
o
n
c
heck_ok_to_
r
em
o
ve()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemen
s
Buc
h
acher
t
7
607: add leading-path tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Cl
e
mens
Buchacher
t7607: use test-lib fun
c
tion
s
and c
h
eck ME
R
GE_HEAD
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
Clemens Buch
a
cher
u
s
e
persiste
n
t memory f
o
r rej
e
cted pa
t
hs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
C
l
emens Bucha
c
her
do n
o
t
o
v
erwrite untracked
during merge from unborn
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens B
u
c
h
ach
e
r
do not overwrite f
i
le
s
in lea
d
ing path
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Cl
e
mens Buc
h
acher
lstat_cache
:
optionally return match_len
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Bucha
c
her
add fu
n
c
t
ion
check_ok_to_remove()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemen
s
Bucha
c
her
t
7607: add lea
d
in
g
-path t
e
sts
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens
Buchacher
t7
6
07:
u
se t
e
s
t-lib f
u
nctions and
c
heck MERGE_HEAD
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Cl
e
mens
Bucha
c
her
do
n
o
t s
e
arch functions
f
o
r patch
ID
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Cleme
n
s Buchach
e
r
add rebase patch id tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-08-17
Cleme
n
s Bucha
c
her
has
h
bina
r
y sha1 in
t
o
patch i
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Clemens Bucha
c
he
r
ls-fil
e
s: allo
w
relative pathspec
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Cl
e
mens Buchacher
quo
t
e
.
c
: separate quot
i
ng and relative path g
e
ne
r
a
t
ion
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Clemens Bucha
c
her
setup: document prefix
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-28
Clemens
Buchacher
get
_
cwd_relative(): do not mis
i
n
t
erpret
suffix
a
s subdirectory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-25
C
le
m
ens Buc
h
ach
e
r
test ge
t
_
g
it_work_tree() return value
for NULL
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-08
Cl
e
mens
B
uchacher
Document
a
tion:
g
it-
a
dd does not update files marked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-01
Cl
e
mens Buchacher
do
not overwrite
f
i
l
e
s
mark
e
d
"
assume
u
ncha
n
g
e
d
"
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-12-05
C
lemens Buchac
h
er
gi
t
-gui: search 4 directories to improve
s
tatistic
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-11-05
C
l
emens B
u
chacher
set httpd port before s
o
urcing lib-httpd
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-31
Clemens Buchache
r
remote-helpers: return successfully if
e
v
erythin
g
up
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-21
Cl
e
men
s
Buchacher
moderniz
e
fetch/merge
/
pull e
x
a
mple
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-17
Clem
e
ns Buchacher
cvs: initia
l
ize empty p
a
ssword
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
Clemens Bu
c
hach
e
r
test local clone by copying
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
Clemens Buch
a
ch
e
r
preserve mtime of local clon
e
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Clemens Buchacher
grep:
accept relat
i
ve paths outside current
w
ork
i
ng
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Cleme
n
s
Buch
a
che
r
grep: fix exit status if
e
xter
n
a
l
_grep() punts
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-18
Clemens Buchach
e
r
fetch: do not
c
reate ref from empty n
a
me
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens Buchacher
t
e
st
-
lib: fix http exit
codes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Cl
e
mens Buch
a
cher
test-lib: a
l
low exit tr
a
p to
be used for cleanup by
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clem
e
ns
B
uchach
e
r
te
s
t-lib: fail if inval
i
d options are
pas
s
ed
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
C
l
e
mens
Buchach
e
r
r
e
f
use to merge during a
m
erge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
C
lemens B
u
chacher
mat
c
h
_re
f
s: searc
h
r
e
f
l
ist tail
i
ntern
a
ll
y
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-31
Cle
m
ens Buchach
e
r
http-push: reuse existing is_nu
l
l_r
e
f
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Clemen
s
Bucha
c
her
f
i
x segfault showi
n
g a
n
empty remote
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Bucha
c
her
s
i
mp
l
ify
output of c
o
nflictin
g
me
r
ge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens
Buch
a
c
h
er
u
pdate cache f
o
r
c
onflic
t
ing submodul
e
entrie
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Cle
m
e
ns Buchacher
add
t
ests for merg
i
ng with submodule
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
C
lemens B
u
chacher
remov
e
pat
h
spec_match, use mat
c
h_pathspec instea
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
C
l
emens Bu
c
hache
r
clean
u
p pathspec mat
c
hing
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buchach
e
r
u
n
pack-trees:
remove redundant path sear
c
h
i
n v
e
rify_absent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buc
h
acher
un
p
a
ck-trees: fix
p
ath
searc
h
bug i
n
verify
_
absent
commit
|
commitdiff
|
tree
2009-01-05
Cl
e
mens Buchache
r
unpack-trees: h
a
ndle fail
u
re in verif
y
_ab
s
ent
commit
|
commitdiff
|
tree
2008-12-15
Cle
m
e
n
s B
u
chacher
modify/d
e
lete c
o
nflict resolution overwrites untrac
k
ed
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Cl
e
mens Buc
h
acher
push: fix local refs updat
e
if already up-
t
o-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Cl
e
mens
Buchacher
do not force write of packed
refs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Clemens B
u
chacher
clon
e
: fix creati
o
n of expli
c
i
tly named target directory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemens Buchacher
g
it gui: show diffs wi
t
h a minimum of 1 context line
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Cle
m
ens Buchacher
http-push: remove
r
emote locks on
exit signals
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Cle
m
ens B
u
c
h
ache
r
Reset
t
he signal be
i
ng
h
andled
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
C
l
emens Buchache
r
m
e
rg
e
-recursive: handle file mode chan
g
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemen
s
Buchacher
http-p
u
sh:
add regressio
n
te
s
ts
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens Buchacher
http-p
u
sh: push
<
rem
o
te> :<branch
>
deletes remote branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree