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 branch 'jn/maint-test-merge-verify-parents'
2011-05-11
Junio C Hamano
Me
r
g
e
b
r
anch 'jn/maint-test-mer
g
e-verify-pa
r
ents'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
i
o C H
a
m
ano
M
erg
e
bran
c
h 'vh/config-interactive-singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
i
o
C Hamano
Merge branc
h
'jc
/
maint-add-p-overlapp
i
n
g-
h
unks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'
s
r
/
m
a
int-fast
-
i
mpo
r
t
-
tighten-option-parsi
n
g
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Haman
o
Merge br
a
n
c
h 'd
m
/http-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
io C Hamano
Merge branch '
j
n
/ctags'
commit
|
commitdiff
|
tree
2011-05-08
J
u
nio C Ham
a
n
o
t3701: add-p-fix
m
akes
the
last test to
pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
onathan
N
ieder
tests: teach ver
i
fy_parents to chec
k
for extra parents
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nieder
tests:
e
liminate
u
nnec
e
ssary setup test
assertions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Update
d
raft re
l
ea
s
e
not
e
s to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Merge branch
'
jn/r
u
n
-
c
o
mm
a
nd
-
e
r
ror-failu
r
e'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io
C Hamano
Merge
branch 'js/info
-
m
an-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Mer
g
e branch 'im/
h
a
s
hcmp-opti
m
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Mer
g
e
b
r
anch 'jk/merge-one-file-working-tree'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge branch 'jc/
f
i
x-dif
f
-f
i
les
-
unmerged'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
M
e
rge branch 'c
j
/p4mer
g
e'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Ha
m
ano
Merge branch
'
gr/cvsimport-
a
lternative-cvspass-locati
o
n'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Me
r
ge branch 'sg/completion-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
a
mano
Me
r
ge bra
n
ch
'
j
s
/
b
l
a
me-par
s
ename'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
branch 'jk/format-patch-quote-special-in-from
'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Ha
m
ano
Me
r
ge branch 'nd/struct-p
a
thspec'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge branch 'aw/maint-reba
s
e
-
i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge branch 'mg/alias-expose-
p
r
e
fix'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Ha
m
a
n
o
M
e
rge
b
r
a
n
c
h
'mg/diff
-
u
i
c
onfig-doc'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2011-05-06
J
o
ão Britto
R
e
move
d
uplicated "is
a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sv
e
rre Rabbe
l
ier
fast-impor
t
:
fix option
parser
for no-arg options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C
Hamano
M
erge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2011-05-05
Valentin H
a
en
e
l
g
it
-
reset
.
t
x
t: better
docs fo
r
'--
p
atch'
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
git-
c
h
e
ckout
.
txt:
b
etter 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
Vale
n
tin Haenel
git
-
stash
.
t
x
t: better
d
ocs
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
Va
l
entin Haenel
g
i
t
-
a
dd
.
t
xt: document '
i
n
t
e
ractive
.
s
inglekey'
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
config
.
t
xt: 'interactiv
e
.
singlekey;
i
s used by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ham
a
n
o
t3
7
01
:
fix here docu
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
i
chael J Gruber
gi
t
-
f
a
s
t-import
.
t
x
t: --relati
v
e-marks takes
n
o p
a
ram
e
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima
S
harov
shel
l
:
a
dd missing init
i
alization of
ar
g
v0_pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Bria
n
G
e
rnhardt
t/a
n
nota
t
e-tests: Use
e
cho &
cat instead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
U
pdate draft releas
e
note
s
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
e
r
g
e bra
n
ch '
m
l
/test-readme'
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
ama
n
o
Mer
g
e br
a
nch 'ft/gitweb-tar-w
i
th-gzip-n'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge bran
c
h 'mg/rev-list-co
u
nt-cherr
y
'
commit
|
commitdiff
|
tree
2011-05-04
J
unio C H
a
mano
Mer
g
e branch 's
s
/do
c
-svn'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch 'jn/form
a
t-patch-d
o
c'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'vr/merge-base-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Merge
b
ra
n
c
h
'ss/cherry-pick-x
-
doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
e
r
ge branch 'jn/mai
n
t-format-patch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C H
a
m
ano
Merge branch 'jk/fo
r
mat-patch
-
m
u
ltiline-header
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge bra
n
ch 'jm
/
mergeto
o
l-submo
d
u
les'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Sy
n
c with 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C
H
aman
o
Gi
t
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Hamano
M
e
rge branch
'j
h
/
dirstat' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hama
n
o
Me
r
ge branch 'sp/mai
n
t-cle
a
r-pos
t
f
ields' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
Hamano
Merg
e
branch 'jk/maint-st
a
sh-
o
ob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge bra
n
ch '
j
k/main
t
-upload-pack-shall
o
w' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge bran
c
h 'dm/sta
s
h-k-i
-
p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge br
a
nch 'jc/pack-objec
t
s-bigfi
l
e
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'mg/reflo
g
-with-o
p
tions' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
M
erge br
a
nch 'jk
/
stas
h
-
l
oos
e
n-safe
t
y'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge
b
ra
n
ch 'a
r
/clean-
r
mdir-
e
mpt
y
' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Hamano
Merge branch 'mg/sha1-path-advise'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Vale
n
tin Haenel
gi
t
-
add
.
tx
t
: document
'add
.
i
g
noreE
r
rors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Tay Ra
y
Chuan
t
5
541-h
t
tp-
p
ush: ad
d
tes
t
for chu
n
ked
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Da
n
M
c
Gee
h
t
tp-push:
r
e
factor curl_easy_setup madness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
http-pus
h
: use const for strings
i
n si
g
natur
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
http: make curl
cal
l
backs
match contracts from curl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
U
pd
a
te draft re
l
e
as
e
notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Juni
o
C Hamano
Merg
e
bra
n
c
h
'jk/notes-ui
-
u
p
dates'
commit
|
commitdiff
|
tree
2011-05-02
Junio C H
a
man
o
Mer
g
e
b
ranch 'ab/i18n-fixup'
commit
|
commitdiff
|
tree
2011-05-02
Junio C
H
amano
Merge branch 'nm/submo
d
ule-upd
a
te-forc
e
'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hama
n
o
Merge branch 'jh/notes-add-ui
'
commit
|
commitdiff
|
tree
2011-05-02
J
unio C Hamano
M
erge br
a
nch
'
nd/m
a
int-setup'
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
io C Hamano
M
e
rge branch 'mz/maint-ren
a
me-un
m
erged'
commit
|
commitdiff
|
tree
2011-05-02
J
onathan
Nieder
Doc
u
men
t
a
tion: clarify meaning of --html-pa
t
h, --man
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Jon Seym
o
ur
gi
t
: ad
d
-
-info-
p
ath and
--m
a
n-path
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Junio
C
H
a
mano
Up
d
ate draft release not
e
s to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
J
unio C Ham
a
no
Mer
g
e branc
h
'r
s
/strbuf-setlen-as
s
ert
'
commit
|
commitdiff
|
tree
2011-05-01
Junio
C Hamano
Merg
e
bra
n
ch 'vh/git-svn-doc'
commit
|
commitdiff
|
tree
2011-05-01
C
iar
a
n Je
s
sup
Pass empty file to p4mer
g
e
wher
e
no base is sui
t
ab
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy R
o
ui
l
lier
Loo
k
f
o
r password i
n
bo
t
h C
V
S and CVSNT p
a
ssw
o
rd
f
iles
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
King
m
e
rge-one-file
:
fix broken merges w
i
th alternate w
o
rk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
ad
d
tests f
o
r merge-index / merge
-
one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Ha
m
ano
"
add -p":
work-around an old la
z
i
nes
s
that
d
o
e
s
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hama
n
o
ad
d
-
-
i
nter
a
ctive
.
perl: factor
o
u
t repe
a
ted --
r
e
c
ount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
t3701: Editing a
s
plit
h
unk in an "
a
dd -p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Ham
a
no
a
dd -p: 'q' shou
l
d r
e
ally quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jakub Narebski
git
w
eb:
Mar
k
matched
'ctag' / c
o
n
t
e
nts tag (?
b
y_t
a
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
ak
u
b Narebski
g
it
w
eb: Change the way "conte
n
t t
a
gs"
(
'ctags') are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jakub Narebs
k
i
g
itweb:
Restruc
t
ure
p
ro
j
ects li
s
t generatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
an
o
Start 1
.
7
.
5
.
1 mai
n
tenanc
e
t
r
a
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merg
e
branch
'mg/x
-
years-12-
m
onths' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2011-04-29
Sylva
i
n
Rab
o
t
git-s
e
nd-email: fix missing space in error
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame:
t
oler
a
te bogus e
-
mail addresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
M
a
thias Lafeldt
t/test-lib
.
sh:
mino
r
rea
d
ability
i
mpr
o
vements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jim Meyerin
g
dif
f
core-ren
a
me
.
c:
a
void set-but-not
-
used warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Juni
o
C Hamano
M
e
rge branc
h
'jc/diff-irrevers
i
ble
-
de
l
ete'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Ha
m
ano
Merge bran
c
h 'jc/ren
a
m
e
-deg
r
ade-
c
c-to-c'
commit
|
commitdiff
|
tree
2011-04-28
Junio
C
Hama
n
o
M
e
rge
b
ra
n
c
h
'mz/
r
eba
s
e'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hamano
M
erge branc
h
'
en/m
e
rge
-
recursive'
commit
|
commitdiff
|
tree
2011-04-28
Ju
n
io
C
Hamano
Merge branch 'jh/dirstat'
commit
|
commitdiff
|
tree
next