repo.or.cz
/
git
/
dscho.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 Hamano
Merge branch 'mz/maint-rename-u
n
m
e
r
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n Herland
t5400: Fix a
couple
of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
Merge bran
c
h 'jc
/
m
a
int-1
.
7
.
4-pathspec-stdin-
a
nd-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Haman
o
Merge branch
'
jc/maint-
1
.
6
.
6-
p
athspec-stdin-
a
nd-cmdli
n
e'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
setu
p
_revisions(
)
:
t
ak
e
pathspec from command line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Contreras
git-comple
t
ion: fix regression in zsh
s
uppor
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Johann
e
s Si
x
t
Honor $(pr
e
f
i
x) set in
c
onfig
.
mak* when d
e
f
i
n
ing ETC_
G
IT*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
i
o
C Ham
a
no
R
e
vert "Honor $(prefix) set in config
.
mak* when
defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
no
t1507: avoid "${parameter<
o
p>'word'}" in
s
ide do
u
ble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
u
nio C Hamano
t3701: ad
d
-p-fi
x
m
a
k
e
s th
e
last test
to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jaku
b
N
a
rebski
Remove g
i
tweb/gitweb
.
cgi and other le
g
a
cy targets f
r
om
.
.
.
Requested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
akub
N
a
rebski
git-instaweb: Simplify build dependency on gitweb
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o
C Ha
m
ano
merge: make branch
.
<name>
.
m
e
r
g
eo
p
tions corre
c
tly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Joã
o
Britto
Remov
e
d
uplicated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverre
Rabbelier
fa
s
t-i
m
port
:
f
ix op
t
i
o
n
parser for no-arg o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C
H
a
m
a
n
o
Merge br
a
nch
'
j
s
/
m
aint-1
.
6
.
6-sen
d
-p
a
ck-stateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
J
eff King
send-p
a
ck: unbreak push over stateless
rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
V
a
lent
i
n H
a
en
e
l
g
i
t
-r
e
set
.
txt
:
bett
e
r
d
ocs 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 Ha
e
n
e
l
git-che
c
kout
.
txt:
b
e
tter docs for '-
-
patc
h
'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Ha
e
nel
g
i
t
-
stash
.
txt
:
bette
r
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
Valen
t
in Haenel
git-add
.
t
xt: document '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
Valent
i
n Haene
l
config
.
t
x
t: '
i
ntera
c
tive
.
singlekey; is
u
sed by
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Hamano
t3701: fix here do
c
u
m
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mich
a
el J
Grub
e
r
git-fast
-
import
.
txt: --re
l
at
i
v
e-mar
k
s t
a
kes n
o
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
h
e
ll:
a
dd mis
s
ing i
n
itiali
z
ati
o
n of ar
g
v0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Br
i
an Gernhar
d
t
t
/
annotate-
t
ests
:
U
se
echo & cat instead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Ham
a
no
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
M
erge b
r
anch 'j
h
/dirstat'
i
nt
o
main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
M
er
g
e
branch 'sp/maint-clear-postfields' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merg
e
b
r
anch 'jk/ma
i
nt-
s
tash-o
o
b
'
i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge bran
c
h 'jk/maint-upload-pack-shallow' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
ch 'dm/st
a
sh-k-i-p
'
into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge br
a
nch 'jc/pack-obj
e
cts-bigf
i
le' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch
'
mg/r
e
f
l
og-wit
h
-
options'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/
s
tash-loosen-safety'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
erge bran
c
h 'ar/cle
a
n-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge bra
n
ch 'mg/sha
1
-path-advi
s
e' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-add
.
txt: document 'add
.
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
Pa
s
s
empty file to p4merge
where no
bas
e
i
s
suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Loo
k
for pa
s
sword i
n
both CVS and CVSNT password fil
e
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f
King
merge-one
-
file: fix bro
k
en me
r
ge
s
with alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for merge
-
index / mer
g
e-one
-
fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C H
a
m
a
no
"add -p"
:
work-
a
r
o
un
d
an
ol
d
laziness that
does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--in
t
eractive
.
perl: fact
o
r out repeat
e
d
--recoun
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Haman
o
t370
1
: E
d
iting a split
hunk in
a
n "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C H
a
man
o
a
d
d -p: '
q
' should really quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Ham
a
no
Start
1
.
7
.
5
.
1 m
a
intena
n
c
e
track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge bran
c
h 'mg/x-years-12-months' into
m
aint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain
Rabot
git-s
e
nd-ema
i
l
:
f
ix missing space
in error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh St
o
ne
blame: tolera
t
e bogus
e-mail addresse
s
a bi
t
b
e
t
ter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
K
a
cper Kornet
Hono
r
$(prefix) set in
c
onfig
.
mak*
w
hen defining
E
T
C_GI
T
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wo
n
g
git-rebase
-
-
interacti
v
e
.
sh: preserve-me
r
ges fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
Michael
J
Grube
r
co
n
fig
.
t
xt,d
i
ff-options
.
txt: porce
l
ain
v
s
.
pl
u
mbing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: q
u
o
te rfc822
specials in email
a
d
dr
e
s
ses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Fraser Tweedale
gitweb: su
p
ply '-n'
to gzip for identical output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
V
a
l
e
n
t
in Haenel
git-svn
.
txt: small typeface im
p
roveme
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
H
aenel
git-svn
.
txt: move opti
o
n desc
r
i
pt
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
tin Haenel
g
it-s
v
n
.
t
x
t
:
fix usage of
--add-au
t
hor-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Ma
t
h
ias Lafeldt
t/R
E
ADME:
unify documentation of test fun
c
t
i
on args
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jun
i
o C Hamano
http: c
l
ear
P
O
S
TFIELDS when i
n
it
i
alizi
n
g a slo
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Ham
a
no
Merg
e
branch 'j
s
/m
a
i
n
t
-1
.
6
.
6
-se
n
d-
p
ack
-
statel
e
ss-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johannes Sixt
send-
p
a
ck
:
a
v
o
i
d d
e
ad
l
ock when pack-obje
c
t dies
e
arly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
G
i
t
1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
F
ix "add -u" that
s
ometi
m
es fails
t
o res
o
lve unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Haman
o
diff-files: show u
n
merg
e
d
en
t
ries co
r
rec
t
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: remove often unused p
a
ramete
r
s from
diff_
u
nmerge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
ni
o
C
Hamano
diff
.
c: return
f
ilepair from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
t
e
st: u
s
e
$_z4
0
fr
o
m
test
-
l
i
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Mich
a
e
l
J Gru
b
er
dat
e
:
avoid
"X years, 12 months" in
relative da
t
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-20
Jonathan Nieder
run-co
m
mand: handl
e
short writes an
d
EINTR in di
e
_ch
i
ld
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-20
J
onathan Niede
r
tes
t
s: chec
k
error message from run_command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Ham
a
no
G
i
t
1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C Ha
m
a
no
Sy
n
c
w
it
h
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
i
o
C Ham
a
no
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ste
f
an Sperling
r
emove noise and i
n
a
ccuracies
f
ro
m
g
i
t
-svn docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Jo
h
annes
S
ixt
Document
a
tion/
f
ormat-patc
h
: suggest T
o
ggle Word
Wrap
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Micha
e
l J Gruber
git
-
svn
.
txt: Document --mergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Ju
n
i
o
C
Hamano
Revert "run-command: pret
t
if
y
-
D
_FORTIF
Y
_
S
OURCE workaround"
commit
|
commitdiff
|
tree
2011-04-15
Sebastia
n
S
c
huberth
doc: Clarif
y
that "c
h
err
y
-pick -
x
" does not use "git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Documenta
t
i
on:
publicize
h
ints for sending patches
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonath
a
n Nieder
D
o
cumentation: p
u
blicize KMai
l
hi
n
t
s
f
o
r sending p
a
tches
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
J
o
nathan Nieder
Do
c
u
menta
t
ion: hints for sendin
g
patches inline wi
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan N
i
eder
Documentation
:
explain
how to check for pat
c
h cor
r
uption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Junio C Hamano
Mer
g
e
v1
.
7
.
5-rc
2
into jn/format-patc
h
-doc
commit
|
commitdiff
|
tree
2011-04-15
J
onatha
n
Nied
e
r
D
o
cument
a
tion: describe the for
m
at
of messages 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 Nied
e
r
Restructure d
o
cumentatio
n
for git-m
e
rge-base
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Vincent van Ravesteijn
Do
c
umentation: update to git-me
r
g
e
-
b
ase --octop
u
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
J
u
n
io C Ham
a
n
o
i18n: use
t
est_i
1
8n{cmp,grep} in t7600, t7607, t7611
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
i1
8
n:
use test_i18n{grep,cmp} i
n
t7508
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Juni
o
C Hamano
i18n: use
t
est_i18
n
grep in t7506
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
amano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René
S
c
h
ar
f
e
ar
c
h
i
ve: document
lim
i
tation of tar
.
uma
s
k config setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t33
0
6,t5304: avoid cl
o
ck skew
i
ssues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
git
.
t
x
t
: fi
x
l
is
t
c
ontinuati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hama
n
o
i
18n
:
use test_i1
8
ngrep a
n
d
test_i18ncmp in t7502
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
i18n
:
use test_i
1
8ngr
e
p in t7
5
0
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
i18n: use test_i18ncmp in t750
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
unio C
H
amano
i18n:
u
se te
s
t_
i
18ng
r
ep in t7
2
01
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Haman
o
i18n: us
e
test_i1
8
ncmp and te
s
t_i
1
8n
g
rep
in t
7
102
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
i18n: use test_i18n
c
mp and test_i18ngrep in t5541,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next