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
C
lemens Buch
a
c
h
er
m
e
rge overwrite
s
uns
t
a
g
ed chang
e
s in renamed file
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-03-05
Cle
m
ens
B
uchacher
http
.
proxy: also ment
i
on htt
p
s_proxy and
a
ll_proxy
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-02-13
C
l
emens Buchacher
do
not overrid
e
receive-pack errors
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-02-13
C
l
emens Buchacher
t5541: check er
r
or
m
essage
against th
e
r
eal port number
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-02-13
Clemens Buchacher
p
ush/fetch/clo
n
e --no-pr
o
g
r
ess su
p
presses p
r
ogress
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-02-13
C
l
eme
n
s B
u
chacher
git rev-
l
ist: fix invalid typeca
s
t
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
C
l
emens Buchacher
git-daemon tests: wait un
t
il daemon is r
e
ady
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
Clemens Buchacher
git-daemon: produce
o
ut
p
u
t
when ready
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
Clemens Buchacher
git-
d
aemon: ad
d
tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
Cl
e
men
s
Buc
h
acher
dashed externals: kill children on e
x
it
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
C
l
emen
s
B
uchac
h
er
crede
n
tials: unable to connect to
c
ache daemon
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-08
Clem
e
ns Buchacher
fix push --qu
i
et: add 'quiet'
c
apability to recei
v
e
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-04
Clemens Buchach
e
r
t
5
550: r
e
pack everything into one file
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2012-01-01
Clemens Buchacher
D
ocumentatio
n
: read
-
tr
e
e -
-
prefix
works with exis
t
ing
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-10-17
Cl
e
mens Buchacher
use t
e
st number as port nu
m
ber
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-10-05
Clem
e
n
s Buc
h
acher
use
-h for synopsis and --
h
elp for
m
a
npage
c
ons
i
s
ten
t
ly
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-09-13
Clemens Buchacher
send-email:
add option -h
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-09-12
Clemens Buchacher
rename pathspec_p
r
efix()
to
c
om
m
on_prefix
(
)
a
nd move
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-09-06
Clemens
B
uchacher
remove p
r
e
f
i
x argument from path
s
pec_pre
f
ix
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-11
Clem
e
ns B
u
chacher
ls-files: fix pathspec display
on error
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-02
C
l
e
mens Bu
c
h
acher
commit: allow partial comm
i
ts with rela
t
ive
p
aths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-01
Clemens Buc
h
ach
e
r
noti
c
e
erro
r
exit from pager
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-01
Clemens Buchache
r
p
r
o
p
a
gate
-
-quiet
t
o
s
e
nd-p
a
ck/receive-
p
ack
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-08-01
Clemens
B
uc
h
acher
error_routine
:
us
e
par
e
n
t
's
s
tderr if ex
e
c f
a
ils
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-02-22
Clemens Bu
c
hacher
do not overwrite unt
r
acked symlinks
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2011-02-22
C
l
emens Buc
h
ache
r
Documentation: c
l
arif
y
-
u
<mo
d
e> option de
f
a
ults
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Cle
m
ens
B
u
chacher
us
e
p
e
rs
i
stent memory fo
r
rejected
pa
t
hs
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buchacher
do not o
v
erwrite fi
l
es i
n
le
a
ding path
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clem
e
ns Buchacher
lstat_ca
c
h
e: optionally return match_le
n
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clemens Buchac
h
e
r
add func
t
ion check_ok_
t
o_remove()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
Clem
e
ns Buchacher
t760
7
: add le
a
ding-path tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-12-14
C
l
emens
B
u
ch
a
c
h
er
t7607: use t
e
st-lib f
u
n
c
tions
an
d
c
heck MERGE_HE
A
D
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
C
l
e
mens Buchacher
use
p
e
rsistent
m
emory for reject
e
d paths
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-11-15
Clemens Buchacher
d
o
not ov
e
rwrite untracke
d
d
u
r
in
g
merge from unborn
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Buchacher
do not overwr
i
te files in leading
p
ath
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Cleme
n
s Buchacher
lstat_ca
c
he: optionally return ma
t
ch_
l
en
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Buchacher
add f
u
nction chec
k
_ok_to
_
remove()
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Buchache
r
t7607: add l
e
adi
n
g-p
a
t
h
tests
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-10-13
Clemens Bu
c
hac
h
er
t7607:
u
se test-lib f
u
ncti
o
ns a
n
d c
h
ec
k
M
ERGE_
H
EAD
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Clemens
B
uchacher
do not sea
r
ch
f
u
nct
i
ons for pa
t
ch ID
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-09-24
Clem
e
ns Buchacher
add rebase patch id test
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-08-17
Clemens Buchacher
h
a
s
h
binary 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-f
i
les: allow r
e
lative path
s
p
e
c
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
Clemen
s
Buchach
e
r
quote
.
c: separate quot
i
ng a
n
d rela
t
iv
e
path
gener
a
tion
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-06-05
C
l
emen
s
Buc
h
acher
setup
:
do
c
ument prefix
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-28
Clemens Buchacher
get_cwd_relative(
)
: do
no
t
m
i
sinter
p
ret
s
u
ffix as subdirectory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-25
Clemens Buchacher
t
e
s
t g
e
t_git_work_tree(
)
r
e
t
urn value for
N
ULL
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-08
Clemens Buchacher
Documen
t
ation: git-add does
n
ot updat
e
files marked
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2010-05-01
Clemens Buch
a
c
her
do not overwrite files m
a
rked
"
assume uncha
n
ged"
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-12-05
C
l
emens
Bucha
c
her
git-gui: s
e
arch 4 dire
c
tories to improve statistic
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-11-05
Clemens Bucha
c
he
r
set httpd port befor
e
sourcing lib-htt
p
d
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-31
Clemens
Buchacher
remote-hel
p
ers: return successfully if everyth
i
ng up
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-10-21
Clemens Buc
h
a
cher
modernize fetch/merg
e
/pull exa
m
p
l
es
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-17
C
lemens Bu
c
h
acher
cvs: initialize emp
t
y
password
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
C
lemens Buchacher
te
s
t local clo
n
e
by copying
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-13
Clemens Buchacher
preserve mtime of local c
l
one
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Clemens B
u
c
h
acher
grep: accept relati
v
e pat
h
s outside current
w
orking
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-09-07
Clemens Buchacher
grep:
fix exit
s
tatus if external_grep() punts
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-18
C
lemens Bu
c
hach
e
r
f
e
tch:
d
o not creat
e
r
ef from empty name
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Cle
m
ens Bu
c
ha
c
her
test-lib: fix http exit codes
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemen
s
B
u
chacher
test-
l
i
b:
allow exit trap to be used for cleanup
by
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Cleme
n
s
Bucha
c
her
test
-
lib:
fail if invalid options are passed
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
C
l
e
m
e
n
s
Buchacher
refuse to m
e
rge
during
a
merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-06-02
Clemens
B
uchacher
match_r
e
fs: search ref list tail intern
a
lly
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-31
Clemens Bu
c
h
acher
http
-
push: re
u
se
e
xisti
n
g
is_null_ref
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-05-28
Clemens
B
uchach
e
r
f
i
x
segf
a
ul
t
showing
a
n empty r
e
m
ote
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
C
lemens Buchacher
simpl
i
fy output of c
o
nf
l
icting merge
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
update c
a
che for conflict
i
ng subm
o
dule entries
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
add tests fo
r
merging
w
ith
s
ubmodules
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
Cl
e
men
s
Buchacher
remov
e
pathsp
e
c_match,
u
s
e matc
h
_pathspec i
n
stead
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-15
C
lemen
s
Buc
h
acher
c
l
e
an up pat
h
sp
e
c matchin
g
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2009-01-05
Clemens
B
uchacher
unpack-tr
e
es: remov
e
red
u
ndant path search in verif
y
_
a
bsent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buch
a
cher
unpack-tr
e
e
s:
fix pat
h
s
earch bug in v
e
rify_
a
bsent
commit
|
commitdiff
|
tree
2009-01-05
Clemens Buc
h
acher
unpack-t
r
ees: handle failu
r
e in verify
_
absent
commit
|
commitdiff
|
tree
2008-12-15
C
lemens Buchacher
modif
y
/
d
elet
e
conflict r
e
solution ov
e
rwrites untracke
d
.
.
.
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
Clemens Buchach
e
r
push: fix local ref
s
u
pdate if al
r
eady up-to-date
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-11-05
C
l
emens Buchacher
do not fo
r
ce write o
f
pa
c
k
ed re
f
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-03
Clemens B
u
c
hacher
clone
:
fix crea
t
io
n
o
f explicitly
n
a
med target
d
ire
c
tory
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-09-01
Clemens
B
uch
a
cher
git gui: sh
o
w diffs with a minimum of 1 conte
x
t line
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clem
e
ns Bu
c
hacher
http-
p
u
s
h: remove remote lock
s
on ex
i
t signal
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-05-25
Clemens
Buchach
e
r
Reset t
h
e
s
ignal being han
d
led
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-03-14
Clemens
Buchacher
merge-recursive: handle file mode c
h
anges
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
Clemens B
u
chac
h
er
http-
p
ush: add regression tes
t
s
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree
2008-02-27
C
l
e
m
e
n
s Buc
h
acher
http
-
pus
h
: push <rem
o
te> :<br
a
nch> deletes re
m
ot
e
branch
Signed-off-by:
Clemens Buchacher
<drizzd@aon.at>
commit
|
commitdiff
|
tree