repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
test: skip clean-up when running under --immediate mode
2011-05-13
Junio C
Hamano
Merge br
a
nch 'jk/
m
erge-one-file-workin
g
-
tree' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ham
a
no
Mer
g
e br
a
nc
h
'jc/
f
ix-
d
iff-files-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
amano
M
e
rge branch 'mz/mai
n
t
-rename-unmerg
e
d'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
land
t54
0
0: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
Merg
e
branch 'jc/maint-1
.
7
.
4-pathspec-stdi
n
-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Me
r
ge branch 'jc
/
m
a
int-1
.
6
.
6-path
s
pec-s
t
din-and-cm
d
l
i
n
e
'
commit
|
commitdiff
|
tree
2011-05-11
J
un
i
o C Haman
o
setup_rev
i
sions(
)
: take pathspec from comm
a
nd l
i
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Con
t
r
e
ras
git-completio
n
: fix regression i
n
zsh support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Joha
n
nes Sixt
Honor $(prefix) s
e
t
in c
o
nfig
.
mak* when defining ETC_GIT*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
Rever
t
"Honor $(prefix) s
e
t in co
n
fi
g
.
mak* w
h
en d
e
fining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C
Hamano
t1507: avoid "
$
{parameter<op>'
w
ord
'
}
" i
n
side double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Juni
o
C Hamano
t370
1
: a
d
d
-
p-fix makes t
h
e l
a
st test to pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebs
k
i
R
emove gitweb/gi
t
web
.
c
g
i
and othe
r
l
e
g
acy targets fr
o
m
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
a
kub
N
are
b
ski
git-instaweb: Simplify b
u
ild depend
e
nc
y
o
n
g
itweb
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 Hamano
m
erge: mak
e
b
r
anch
.
<name>
.
m
ergeoptions correc
t
l
y ov
e
r
ride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Remove duplicated "
i
s a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverr
e
Rabbelier
fas
t
-
i
m
port: f
i
x option
p
arser for no-arg opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
ano
Merge
b
ranch 'j
s
/maint-1
.
6
.
6-send-
p
ack-
s
tateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-p
a
ck: unbrea
k
pu
s
h o
v
er
s
tateless
r
pc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Val
e
n
t
in Haene
l
gi
t
-reset
.
txt: better d
o
c
s
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-checkou
t
.
txt: b
e
tte
r
docs
f
or '--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 Haenel
git-stash
.
txt: better docs fo
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
Va
l
ent
i
n Haenel
git-add
.
txt: docum
e
n
t
'interactive
.
singlekey
'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valenti
n
Haenel
config
.
txt: 'inte
r
active
.
singlekey; is us
e
d by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C Hama
n
o
t
3701: fix here d
o
cument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hael
J
G
ruber
g
i
t-fas
t
-import
.
t
x
t: --rel
a
tive-marks
t
akes n
o
pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shell: add missing ini
t
ializ
a
tion of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian
Gernhar
d
t
t/annotate-tests:
Use ec
h
o & cat instead of
s
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C
Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge branch 'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge bran
c
h 'sp/m
a
int-cle
a
r-postfields' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge br
a
nch '
j
k/maint-stash-oob' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Mer
g
e
branch 'jk/maint-upload-pack-shallow' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
M
e
r
ge branch '
d
m
/
st
a
s
h
-k-i-p'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'jc/pack-objects
-
bi
g
file' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
M
erge br
a
n
ch 'mg/refl
o
g-with-options' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Ha
m
ano
Merge bra
n
ch 'jk/stash-loosen
-
s
a
f
ety' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C
Hamano
Merge
branch 'ar/clean
-
rm
d
ir-em
p
t
y'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Haman
o
Merge branch
'mg/sha1-
p
ath-ad
v
ise'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-add
.
t
xt: do
c
ument 'add
.
ignoreErrors'
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 f
i
le to p4me
r
ge where no
base is su
i
table
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Loo
k
for passwo
r
d i
n
both CVS and CVSNT passw
o
rd
f
i
les
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f King
mer
g
e-one-f
i
le
:
fix broken merges with alt
e
rnate wor
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add
te
s
ts f
o
r
merge-ind
e
x / merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -
p
": work-aro
u
nd an old laziness tha
t
does
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
a
d
d
-
-interact
i
ve
.
perl: fa
c
tor out r
e
pe
a
ted --re
c
ount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
t
3
701: Editing a split hunk in an "add -p
"
session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add -p:
'q' sh
o
uld
r
eally quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
Start
1
.
7
.
5
.
1 main
t
en
a
n
ce tra
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
un
i
o C Hamano
Merge branch 'mg/
x
-years-
1
2-mo
n
th
s
' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-email: fix mi
s
sing
space
in
error mes
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh St
o
ne
blame
:
t
o
l
e
r
ate bogus e-mail addresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
K
acper
Kornet
Hono
r
$(prefix) s
e
t
in config
.
mak*
when d
e
fin
i
ng ETC_GIT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git-rebase--i
n
teracti
v
e
.
sh: preserve-
m
e
r
ges fai
l
s on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-27
Mich
a
el J
Gruber
co
n
fig
.
t
x
t,diff-
o
ptio
n
s
.
txt: porcelain vs
.
plumbing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: quot
e
rfc
8
22 specials in email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Fraser
Tweedale
g
i
tw
e
b
:
s
up
p
ly '-n'
to gz
i
p for
i
dentical
o
ut
p
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
H
aenel
git-
s
vn
.
t
x
t: sm
a
ll ty
p
eface
i
mprovements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haen
e
l
git-svn
.
t
x
t: move opt
i
on descriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Va
l
entin H
a
enel
git-
s
v
n
.
txt: fi
x
usage
o
f --add-author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Mathia
s
Lafeldt
t/README: unify documentati
o
n of test fu
n
ction args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio
C
H
amano
http:
clear PO
S
TFIE
L
DS wh
e
n in
i
tializin
g
a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio
C
Hamano
Mer
g
e branch 'js/m
a
int-1
.
6
.
6-send-pack-stateles
s
-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johanne
s
Sixt
send-pa
c
k
:
avoid deadlo
c
k w
h
en pa
c
k-obje
c
t dies early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
io C
Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
Fix "add -u"
that some
t
imes fails to
r
e
solve unmerg
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
diff-files: show
u
n
merged entri
e
s co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Ham
a
no
diff: remov
e
oft
e
n un
u
sed paramete
r
s from d
i
f
f_
u
nmerge(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
uni
o
C Hama
n
o
dif
f
.
c:
r
eturn filepair from diff_
u
n
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
ni
o
C Hamano
test: us
e
$_z40 from te
s
t
-
lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michae
l
J Gruber
date: avoid "X years, 12 mo
n
ths" in rel
a
tive dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-20
Jonathan Nied
e
r
run-co
m
ma
n
d:
h
andle short
writes
an
d
EINTR
in die_chi
l
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-20
Jonatha
n
N
i
eder
tests
:
check error message from
r
un_command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io
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 Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Juni
o
C Haman
o
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Stefan Sper
l
ing
rem
o
v
e nois
e
and
ina
c
cu
r
acie
s
from
g
it-svn docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Johannes Six
t
Documentation/format-patch: suggest Toggle Wor
d
Wrap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
hae
l
J Gru
b
er
g
i
t-
s
vn
.
txt: Docum
e
nt --mergein
f
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Ha
m
ano
R
evert "run-command: prettify -D_FO
R
TIFY_
S
OURCE workaround"
commit
|
commitdiff
|
tree
2011-04-15
Se
b
astian Schuberth
doc: Clarify
that
"cherry-
p
ick -x"
d
o
es not use "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
J
onath
a
n Nieder
D
ocum
e
ntatio
n
: publ
i
ciz
e
hi
n
ts for s
e
nding patches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonat
h
an Nieder
Do
c
um
e
n
t
ation: p
u
blicize KM
a
il hints fo
r
se
n
din
g
patches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Ni
e
d
e
r
Doc
u
mentatio
n
:
hints for se
n
ding patche
s
inlin
e
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jona
t
han Nieder
Documentation: explain how
to ch
e
ck
f
o
r patch c
o
rruption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Junio C Hama
n
o
Merge v1
.
7
.
5-rc2 into j
n
/fo
r
mat
-
patch-doc
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nied
e
r
Documenta
t
ion: desc
r
ibe the format
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
Jonath
a
n
N
ieder
Restruc
t
ure
d
ocument
a
t
ion for git-merge-base
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Vincent
v
an R
a
vesteijn
Documentat
i
o
n
: update to git-mer
g
e-base --o
c
t
opus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio
C Hamano
i18n: use
test_i18n{cmp,grep} in t7600, t76
0
7,
t7611
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Jun
i
o C Ham
a
no
i
1
8n:
u
se te
s
t_i18n{grep,cmp
}
in t75
0
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Ju
n
io
C
Ham
a
no
i18n: use
test_i18ng
r
ep in
t
75
0
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C
Hamano
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2011-04-14
René S
c
harfe
archiv
e
: d
o
cument
l
i
m
itation o
f
tar
.
umask conf
i
g setti
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hael J G
r
uber
t33
0
6,t5304: avoid clo
c
k skew
issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
git
.
txt: fix list continuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hama
n
o
i
1
8n
:
u
se test_i1
8
n
g
rep and
tes
t
_i18ncm
p
in t7502
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
i1
8
n:
use
t
est_i1
8
ngre
p
in t7501
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C Hamano
i18n:
u
se test_i1
8
ncmp in t7500
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hamano
i18n: use test
_
i18ngrep in
t
720
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next