repo.or.cz
/
alt-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-1.7.4' into maint
2011-05-13
Junio C
H
amano
Merge
branch 'mz/mai
n
t-re
n
ame-unm
e
rged' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t5400: Fix
a
couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
i
o C H
a
mano
Me
r
g
e
bran
c
h 'jc/maint-1
.
7
.
4-pathsp
e
c-stdin-and-
c
mdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
Merge bra
n
ch 'jc/ma
i
nt-1
.
6
.
6-pa
t
hspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
m
a
no
set
u
p_revisio
n
s(): take pathspec from
c
ommand l
i
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Felipe C
o
ntreras
git-
c
omple
t
ion: fix re
g
ressio
n
in z
s
h s
u
p
p
ort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Johannes Sixt
H
o
nor $(prefix) s
e
t in config
.
m
a
k* when defining ETC_GIT*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
R
e
vert "Hon
o
r $(
p
re
f
ix) set
i
n
config
.
mak* when
def
i
ning
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
no
t1
5
07: av
o
id "${parameter<op>'wor
d
'}"
i
n
side doubl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t370
1
: add-p-fix make
s
th
e
last test to p
a
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jak
u
b
Narebsk
i
R
e
move gitwe
b
/gitweb
.
cgi and
other legacy targets from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Nar
e
bski
git
-
instaweb: Sim
p
lify b
u
ild dependenc
y
o
n
g
i
tweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
merge: ma
k
e
b
r
anch
.
<name>
.
m
e
r
g
e
options correctly ov
e
rride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jo
ã
o Britto
R
e
m
ove dupli
c
at
e
d
"
is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
S
verre Rabbelier
fast-imp
o
r
t
:
f
ix
o
ption parser for n
o
-arg options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
M
erge branch
'
js/maint-1
.
6
.
6-send-pack-
s
t
ateless
-
r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-pack: unbreak push over s
t
ate
l
ess rp
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Hae
n
e
l
git-reset
.
txt
:
be
t
te
r
docs for '--
p
at
c
h'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
V
alentin Haenel
git-checkout
.
t
x
t: better docs
for '--p
a
tch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Va
l
entin
Haenel
git-
s
tash
.
txt
:
better docs f
o
r '--patch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
V
alentin H
a
enel
git-
a
dd
.
txt: docum
e
n
t
'in
t
eractive
.
singlekey'
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
ntin H
a
en
e
l
co
n
fig
.
tx
t
: 'intera
c
t
ive
.
si
n
glekey; is
u
sed by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C
Hamano
t3701: fi
x
h
ere d
o
cume
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
i
chael J Gruber
git-fast-import
.
txt
:
--rela
t
i
ve-marks
t
akes no
p
a
ra
m
e
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
D
i
ma Sharov
s
h
ell: add missing initializa
t
ion of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/annotate-
t
es
t
s
: Use echo & cat instead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
G
i
t 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge br
a
n
c
h 'jh/dirstat
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h 's
p
/maint-clear-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Ham
a
no
Merge
branch 'jk/mai
n
t-
s
tash-oob
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
amano
Merg
e
b
r
anch '
j
k/maint-upload-pack-shallow' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
M
e
rge
branch 'dm/stash-
k
-i-p
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
Hama
n
o
Merg
e
b
r
anch
'jc/pack-
o
bjects-bigfile
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch
'
mg/ref
l
og-with-op
t
io
n
s' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branc
h
'jk/stas
h
-loosen-safety' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
e
rge bra
n
ch 'ar/clean-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'mg/sha1-path-
a
d
v
ise' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
V
alentin Haenel
git-add
.
tx
t
: document 'a
d
d
.
igno
r
eErrors'
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
Pass empty file to p4m
e
r
g
e
where
n
o base i
s
suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
L
ook fo
r
passwo
r
d
in
b
oth CVS and CVSNT password files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-
f
ile: fix br
o
ken
m
erges with alternate wor
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
a
dd tests for merge-index / me
r
ge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
"
a
dd -p
"
: work-arou
n
d an old laz
i
n
ess th
a
t d
o
es not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C H
a
mano
add--inter
a
ctiv
e
.
perl: factor out repeated
-
-recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701: E
d
iting a sp
l
it hunk in an "a
d
d -p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
add
-p
:
'q' should really q
u
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hama
n
o
Sta
r
t 1
.
7
.
5
.
1 maintenanc
e
t
r
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch '
m
g
/
x-yea
r
s-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-sen
d
-
email:
f
ix mis
s
i
n
g space
in error
me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tolerate bogus e-mail
a
d
dresses a bit bet
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Kacper Kornet
Honor $(prefix
)
set
in con
f
ig
.
mak
*
w
h
en defining E
T
C_
G
IT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
A
n
drew
W
on
g
git-
r
ebase--inter
a
ct
i
ve
.
s
h: pre
s
erve-m
e
rges fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-27
Michael J
Gruber
config
.
txt,
d
iff
-
o
p
tions
.
txt: porcelain vs
.
plumbing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty:
q
uote rfc822 specials in e
m
ail
a
ddres
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Fras
e
r
Twee
d
ale
gitweb: suppl
y
'-n' t
o
gzip for
i
dentical
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haen
e
l
git-svn
.
txt: small
t
ypefa
c
e
i
m
p
rove
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: move option descriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
a
lentin H
a
enel
git-
s
vn
.
txt:
f
ix usage of
-
-a
d
d-au
t
ho
r
-fro
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
M
ath
i
a
s
L
afe
l
dt
t/README: unify
d
o
cumentation of t
e
st fu
n
ct
i
on args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jun
i
o
C
Hamano
h
ttp:
clear POSTFIELDS when initializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Hamano
Merge branch '
j
s/mai
n
t-1
.
6
.
6-se
n
d-p
a
ck-stateless-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Joh
a
n
n
e
s Sixt
send-pac
k
: a
v
oid dea
d
lock
w
h
en
pack-object dies e
a
rl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
H
amano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C H
a
mano
Fi
x
"add -u" that somet
i
m
e
s fails to resolve unme
r
ged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
amano
diff-
f
iles:
show unmerged
e
ntries cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
ff:
r
emove
o
ften unus
e
d parameters from diff_u
n
merge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
diff
.
c: return f
i
lepair from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
mano
test: use $_z40 fr
o
m test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Mi
c
hael J
G
r
uber
date: avo
i
d "X years, 12 months" in rel
a
t
ive dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-20
Jonathan Nieder
r
u
n-command:
h
andle
s
h
o
rt writes and EINTR in die_child
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-20
Jonathan Nied
e
r
te
s
ts: check error message from
run_c
o
mmand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
a
mano
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
i
o
C Hama
n
o
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
u
n
i
o C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Stefan Sperli
n
g
r
e
m
ove noise and
inacc
u
racies from g
i
t-svn
d
ocs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Johann
e
s
Sixt
Documenta
t
ion/forma
t
-patc
h
: su
g
gest Toggle W
o
rd Wrap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git
-
s
vn
.
txt: D
o
c
ument --mer
g
einfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
R
e
v
e
r
t "ru
n
-command
:
prettify -D_FORTIFY_SO
U
RCE workaround"
commit
|
commitdiff
|
tree
2011-04-15
Sebas
t
ia
n
Schuberth
doc
:
Clarify that "ch
e
rry-pick -
x
" does n
o
t
u
s
e
"gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
J
o
na
t
han Nieder
Docume
n
tation
:
p
u
blicize
hints for sendin
g
patch
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jon
a
than Nieder
Documentation
:
publicize KM
a
i
l hints for sending patches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
J
o
nathan Niede
r
Documentation: hints f
o
r sendi
n
g patches inline
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
J
o
n
a
t
han Nie
d
e
r
Documentation: e
x
plain how
t
o
check f
o
r patch
c
orruption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jun
i
o
C
Hamano
Merge v1
.
7
.
5-rc2 into jn/format-
p
atch-doc
commit
|
commitdiff
|
tree
2011-04-15
Jonathan
Nie
d
er
D
o
c
umentati
o
n: de
s
crib
e
the form
a
t o
f
messa
g
es
with
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Niede
r
Re
s
tru
c
ture do
c
umenta
t
ion for git-me
r
g
e
-base
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Vin
c
ent
van Ravesteijn
Do
c
u
m
ent
a
tion: u
p
d
a
te to git-mer
g
e-base --octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
i18n
:
us
e
test_i18n{c
m
p,gr
e
p}
i
n t760
0
, t7607, t761
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
J
u
nio C H
a
m
a
no
i18n:
use te
s
t
_i18n{gre
p
,cmp} in t7508
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Haman
o
i18n: use test_i1
8
ngrep in t75
0
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Haman
o
Merge b
r
an
c
h
'maint'
commit
|
commitdiff
|
tree
2011-04-14
R
e
n
é
Sc
h
arfe
archive: document limitation of tar
.
umask
c
onfig setti
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t
3
306,t5304: av
o
id
c
l
oc
k
skew i
s
sues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mich
a
el
J
Gr
u
ber
gi
t
.
txt: fix
list
continuatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
i18n: use
tes
t
_i18ngr
e
p
a
nd
test_i18ncmp in
t
7502
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hama
n
o
i18n
:
use t
e
st_i18ngrep in t7501
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C Hamano
i18n:
u
s
e test_i18ncmp in t7500
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C Ham
a
n
o
i18n: use test_i18ngrep
in t72
0
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hamano
i1
8
n: use test_i18nc
m
p and tes
t
_i18ngrep in
t
71
0
2
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
i
1
8n: use test_i18ncmp and test
_
i18ngrep in t5541,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next