repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
http.c: fix an invalid free()
2011-05-13
J
unio C Hamano
Merge branch 'cj
/
p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ra
n
c
h
'
j
k
/merge-on
e
-
file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'jc
/
fix-diff-files-unmerged'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
amano
Merge branch 'mz/maint
-
rena
m
e-unmerge
d
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herland
t5400: Fix a couple of typo
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
mano
Merge branch 'jc/mai
n
t-1
.
7
.
4
-
path
s
pec-
s
tdin-and-cmd
l
ine'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Haman
o
Mer
g
e branch 'jc/ma
i
nt-1
.
6
.
6-p
a
thspec-std
i
n-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
man
o
s
e
tup_re
v
isions(): take p
a
thspec from c
o
mmand line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Felip
e
Co
n
treras
git-compl
e
tio
n
: fix
r
egression in zsh support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Joha
n
nes S
i
xt
Honor $(prefix
)
s
et in confi
g
.
mak* w
h
en
d
efinin
g
E
T
C_GIT*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io
C
Ha
m
ano
Revert "H
o
n
o
r $(p
r
efix)
set i
n
config
.
mak*
w
hen defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C
H
amano
t1507: av
o
i
d "${parameter<op>'word'}"
i
n
s
i
d
e
dou
b
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
unio C Hamano
t
370
1
:
add-p-fix mak
e
s the last test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Na
r
e
b
s
k
i
Re
m
ove gitweb/gitweb
.
cgi and other legacy ta
r
g
e
ts from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jak
u
b
Nare
b
sk
i
git-instaweb: Simplif
y
build dependency on gitw
e
b
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
merge: make branch
.
<name>
.
merge
o
pt
i
ons correctly
o
verride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João
B
r
i
t
to
Rem
o
ve
d
upl
i
cated "i
s
a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbeli
e
r
fast-import: fi
x
op
t
ion parser for no-ar
g
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge bra
n
c
h
'js
/
maint-1
.
6
.
6-sen
d
-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
J
eff
K
i
ng
send-p
a
ck:
u
n
br
e
ak push over stat
e
less rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin
H
aen
e
l
git-
r
eset
.
txt
:
b
e
t
ter docs for '--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valent
i
n Haenel
g
i
t-ch
e
ckout
.
txt: bet
t
er docs for '--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin
Haen
e
l
git-stash
.
txt: better docs
for '--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Val
e
n
ti
n
Haenel
g
i
t-ad
d
.
txt: documen
t
'int
e
ractive
.
si
n
gle
k
ey'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haenel
conf
i
g
.
tx
t
: 'interact
i
ve
.
si
n
g
l
ekey; i
s
used by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
u
nio C
H
aman
o
t3701
:
fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Micha
e
l J Grube
r
gi
t
-fas
t
-import
.
txt: --
r
elative
-
marks
t
a
k
e
s no para
m
e
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shell
:
a
d
d
m
issing in
i
tialization of a
r
gv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/a
n
notate-tests: Use echo
&
cat in
s
t
e
ad of
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
m
a
no
Merge branch
'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C Hamano
Mer
g
e branch 'sp/main
t
-clear-p
o
s
tfields'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge
bra
n
ch 'j
k
/
maint-st
a
sh-oob' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge
b
ran
c
h 'jk/maint-uploa
d
-pa
c
k-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
g
e
br
a
nch 'dm/stash-k-i-p' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
amano
Merge br
a
n
ch 'jc/p
a
ck-objec
t
s-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch 'mg/r
e
flog-with-op
t
io
n
s'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
amano
Merge branch 'jk/stash-l
o
osen-safety' i
n
to
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch
'ar/clean-
r
m
d
ir-empty' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Ham
a
no
Me
r
ge branch
'
mg/sha1
-
path-adv
i
s
e
'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
g
i
t-add
.
txt:
d
oc
u
ment
'
add
.
ignoreErr
o
rs'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
Pa
s
s
e
m
p
ty fil
e
to p4merge where no base is suitab
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouil
l
i
er
Look
f
or
password
i
n both CVS and
C
V
SNT password files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
eff
K
ing
merg
e
-
o
ne-file:
f
ix broken merges with alternat
e
wo
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
a
d
d tests for
m
erge-inde
x
/ merg
e
-one
-
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
"add -p": work-around an old laziness that
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
add--interactive
.
perl: fa
c
t
o
r out re
p
eated --rec
o
u
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
t
3701:
E
diting a spl
i
t hunk in
a
n "add
-p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io
C
Ha
m
an
o
a
dd -p: 'q' sho
u
ld really qu
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
io C Hamano
Star
t
1
.
7
.
5
.
1 maintenan
c
e trac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio
C
H
a
mano
Merge branch 'mg/x-years-12-mont
h
s' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-email: f
i
x missing
s
pa
c
e in e
r
ror
me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame
:
tol
e
rate
bogus e-mail
a
ddresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
K
acp
e
r Kornet
H
o
nor
$
(
prefix
)
set
in
con
f
ig
.
mak* when def
i
nin
g
ETC_GIT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
An
d
rew
W
ong
git-rebase--interactive
.
sh: p
r
eserve-m
e
rges fail
s
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-27
Michael J Gruber
config
.
txt,diff-options
.
txt: por
c
el
a
in vs
.
plumbin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
e
ff King
pretty: quote rfc822 specials in email addr
e
s
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Fraser Twe
e
da
l
e
g
i
t
web:
s
upp
l
y
'
-
n
' to g
z
ip
for
i
dent
i
cal
outp
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
g
i
t-svn
.
txt: sma
l
l type
f
ace improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
i
n
Hae
n
el
git-svn
.
txt: mov
e
opt
i
on descripti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git
-
sv
n
.
txt: fix usage of --ad
d
-author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Ma
t
hias
L
a
f
e
l
dt
t
/
REA
D
ME
:
u
n
ify
documentation o
f
t
e
st function args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
unio
C Hamano
http: clear
P
OS
T
FIELDS when init
i
alizing a slo
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Hamano
Merge branch '
j
s/
m
aint-1
.
6
.
6-send-pack-st
a
teless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johannes Sixt
send-pack: avoid deadlock when pack-object
dies earl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C H
a
mano
G
it 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
H
am
a
no
Fi
x
"a
d
d
-
u
"
t
h
a
t
sometimes fails to resolve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
H
amano
diff-
f
iles: s
h
ow unme
r
g
ed entri
e
s correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Ham
a
no
d
i
ff
:
remove
oft
e
n unu
s
e
d paramet
e
r
s
from diff_unmer
g
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Ha
m
ano
diff
.
c: retu
r
n filepair from d
i
ff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Hamano
test:
use $_z40 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J
Gruber
date: avoid "X years, 12
months" in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-20
Jonathan Nieder
r
un-c
o
m
mand: handle short writes and
EIN
T
R in die_chi
l
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-20
J
onathan Nieder
tests: check er
r
or messag
e
from r
u
n_command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o C Hamano
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Haman
o
Sync
with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ham
a
no
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Stefa
n
Sperling
remove noise an
d
in
a
cc
u
racies
from g
i
t-svn docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jo
h
annes Six
t
Documentation/format-pat
c
h: suggest Toggle Wo
r
d
Wrap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gr
u
ber
git-s
v
n
.
txt: Document --mer
g
einfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
R
evert
"run-comman
d
: pr
e
ttify -D_FORTIFY_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-15
S
e
bastian Schuber
t
h
do
c
: Clarify
that "cherry-
p
ick -x
"
does n
o
t use "g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jon
a
than
N
i
e
der
Documentation: publicize hi
n
ts for se
n
ding pat
c
hes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonath
a
n Nieder
Documentation:
publicize
KM
a
il h
i
nts for se
n
di
n
g patches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jon
a
than N
i
eder
Documentation:
h
ints
for sending
p
atches inline with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jo
n
a
t
han Nieder
D
o
c
umentati
o
n: explain how t
o
check
f
o
r patch corr
u
pt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jun
i
o C
H
aman
o
Merge
v1
.
7
.
5-rc2 into jn/for
m
at-p
a
tch-doc
commit
|
commitdiff
|
tree
2011-04-15
Jonathan
Nieder
Documentation:
describe the format
o
f
me
s
sages
with
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
J
o
n
athan
N
ieder
Restructure docum
e
ntation for g
i
t
-merge-ba
s
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Vincent
v
an R
a
vesteijn
Docume
n
tation: update to git
-
merge-b
a
se --
o
c
t
op
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
J
u
n
i
o C Hamano
i18n: use test_i18n{cm
p
,grep} in t7600, t76
0
7, t
7
611
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Juni
o
C Hamano
i18n: use
t
est_i18n{grep,cmp} in t7508
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio
C
Hamano
i18n: u
s
e te
s
t_i18ngrep in t75
0
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
amano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
Ren
é
S
char
f
e
arch
i
v
e
: docume
n
t limitatio
n
of tar
.
u
m
ask config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gr
u
ber
t
3306,t5304: avoid clock skew iss
u
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Grube
r
git
.
txt: fi
x
list continu
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C Hamano
i18n: use test_i18ngrep and test_i18ncmp in t7502
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o
C Hamano
i18n: use test_i1
8
n
g
rep
in t7501
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C
Hamano
i18n: use tes
t
_
i
18ncmp in t7500
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next