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
Merge branch 'jc/maint-branch-mergeoptions'
2011-05-11
J
u
nio C Hamano
Merge
b
ranch 'jc/maint-b
r
anch
-
m
ergeopt
i
ons'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merge
b
ranch
'
jn/maint-te
s
t-m
e
rge-v
e
r
i
fy-par
e
nts'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hama
n
o
Merge bra
n
c
h
'
v
h/co
n
fi
g
-i
n
teractiv
e
-singleke
y
-doc
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Mer
g
e branch 'jc/maint-add-p-ove
r
lapping-hunks'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge b
r
anch 's
r
/
m
a
i
nt-fast-import-t
i
g
h
ten
-
option-pa
r
sing'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Ha
m
ano
Merge b
r
anch 'dm/http-cl
e
anup
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge branch
'
jn
/
ctags'
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add
-
p-fix mak
e
s the last test to
pas
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jo
n
a
t
ha
n
Niede
r
tes
t
s: teach verify_pare
n
t
s to check
f
o
r
e
x
t
ra parents
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
merge:
m
ak
e
bran
c
h
.
<n
a
me>
.
mergeoptio
n
s corr
e
ctly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jonath
a
n Nieder
te
s
ts: eliminate
u
nnecess
a
ry setup test assertions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Updat
e
dra
f
t release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
u
n
io C Hamano
Mer
g
e
b
ranch
'jn/run-command-error
-
failure'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge branch '
j
s/in
f
o
-
man-path'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Hamano
Merge branch 'im/h
a
shcmp-op
t
im'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Me
r
ge branch 'j
k
/merge-one-f
i
le-
w
o
rking-tr
e
e
'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Merge branch 'jc/fix-diff-fil
e
s-unmerged'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Ham
a
no
Merge branch
'
c
j/p4me
r
g
e
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
Merge br
a
nch '
g
r/cvs
i
mpor
t
-
a
lternat
i
ve-cvspass-locat
i
on'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch
'sg/c
o
mpletion-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
i
o C Hamano
Merg
e
branch 'js/blame-par
s
ename'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge branch 'jk/f
o
rmat-p
a
tch-
q
u
ote-sp
e
c
i
al-
i
n-fro
m
'
commit
|
commitdiff
|
tree
2011-05-06
J
un
i
o C Haman
o
Merge br
a
nch 'nd/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merge branch
'
aw
/
maint-rebase
-
i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
M
erg
e
branch 'mg/al
i
as-expose-pref
i
x
'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Mer
g
e br
a
nch 'mg/diff-uiconfig-doc'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-06
João
B
ritto
R
e
move duplicat
e
d "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sv
e
r
r
e Rabb
e
lier
fast-i
m
port: f
i
x
o
p
t
i
on parser for
no
-
arg op
t
io
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ham
a
n
o
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-05-05
Valen
t
in
H
aenel
g
i
t-r
e
set
.
t
x
t: better 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 Haenel
git
-
checkout
.
t
xt: b
e
t
ter docs for '--pa
t
ch'
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 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
Valentin Haen
e
l
g
it-add
.
t
x
t: docu
m
ent '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
Valent
i
n Haenel
config
.
t
x
t
: 'interactive
.
singlekey; is us
e
d
by
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix here doc
u
men
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
M
i
cha
e
l J Gr
u
ber
git-fast-import
.
txt: --rel
a
tive
-
marks takes no pa
r
ameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a Sharov
s
hel
l
:
add m
i
ssing init
i
aliza
t
ion of
a
r
g
v0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
B
r
ia
n
G
e
rnha
r
dt
t/annotate-tests: Use echo &
c
a
t
inste
a
d of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Hamano
U
pdate dra
f
t release no
t
e
s to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge branch 'ml
/
test-r
e
adme'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
c
h
'
ft/gitweb
-
tar-wi
t
h-gzip
-
n'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
ma
n
o
Merge
bran
c
h 'mg
/
r
e
v
-lis
t
-count-
c
herry'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
r
ge branch 'ss/
d
oc-svn
'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge branch 'jn/f
o
rmat-
p
atch-
d
oc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Merge
b
ranch 'vr/merge-base-doc'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Ham
a
no
Mer
g
e
branch 'ss/cherry-pick-x-d
o
c'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'jn/main
t
-
for
m
at-patch-doc
'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ham
a
no
M
e
rg
e
branch
'
j
k/format-patch-multiline-header'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge br
a
nch '
j
m
/
mergetool-submodules'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Sync wit
h
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Git
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
M
e
rge branch 'jh/dirs
t
at' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branch 'sp/ma
i
nt-cl
e
a
r-postf
i
elds' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ham
a
no
M
e
rg
e
b
r
anch 'j
k
/
maint-sta
s
h
-
oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Ham
a
no
Merge branch 'jk
/
maint
-
u
p
l
oad-pa
c
k-shallow' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o
C
Hamano
Merge branch 'd
m
/stash-k-i-p
'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge br
a
nch
'
j
c/pa
c
k-objects-bigfile' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
ama
n
o
M
erge branch 'mg/reflog-with-options' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Ham
a
no
M
erge branch
'
jk/stash-loose
n
-safety' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C Hamano
M
erge
branc
h
'
a
r/cle
a
n-
r
mdir-e
m
pty'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
am
a
no
M
erge branch 'm
g
/
sha1-path-advise
'
into
main
t
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-add
.
t
x
t: do
c
ument
'add
.
i
g
noreErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Tay Ray Ch
u
an
t
5
541-http-pu
s
h: add test f
o
r chunked
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
D
a
n McGe
e
h
ttp-push
:
refacto
r
cu
r
l_easy_set
u
p madness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Dan McG
e
e
http-push: use
const for strings in signatures
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
http: make
curl c
a
llbacks
m
atch
c
ontracts
from curl
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C
Hamano
Update draf
t
release
n
otes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Junio C
H
a
m
ano
Me
r
ge branc
h
'jk/notes-ui-upd
a
tes'
commit
|
commitdiff
|
tree
2011-05-02
Junio
C
Ham
a
no
Merge bran
c
h 'ab/i18n-fixup'
commit
|
commitdiff
|
tree
2011-05-02
J
unio C Hamano
Me
r
ge
bra
n
ch
'
nm/sub
m
odule-
u
p
d
ate-force'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Merge br
a
nch 'jh/not
e
s-add-ui'
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C Haman
o
Me
r
ge
b
ranch 'nd/m
a
int-setup'
commit
|
commitdiff
|
tree
2011-05-02
Junio C
Hamano
Merge branch 'mz/maint-rename-unmerg
e
d'
commit
|
commitdiff
|
tree
2011-05-02
Jonathan Ni
e
der
Doc
u
me
n
t
a
tion: cla
r
if
y
meaning of
-
-ht
m
l-p
a
t
h
, --ma
n
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Jon
S
eymour
g
i
t: add --info-path
a
n
d
--man-p
a
th
opt
i
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio C
Hamano
Update draft release notes to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Merge br
a
nch 'rs/s
t
r
b
u
f-s
e
tlen-assert'
commit
|
commitdiff
|
tree
2011-05-01
Junio
C
H
a
m
a
no
M
e
rg
e
branch 'vh/
g
it-sv
n
-doc'
commit
|
commitdiff
|
tree
2011-05-01
C
iaran Jess
u
p
Pass empty file
to p4me
r
g
e where
n
o
b
as
e
is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y
R
o
u
i
llier
Look fo
r
p
a
ssword in
b
ot
h
CVS
and CVSNT password
files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f
King
mer
g
e
-
o
n
e
-fil
e
:
f
ix
broken m
e
rges with al
t
erna
t
e work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
eff
K
i
n
g
add
tests
for mer
g
e
-in
d
ex / merge-one-fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hama
n
o
"add -p": wor
k
-around an old
l
azines
s
t
h
at does no
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Haman
o
add--
i
n
t
e
r
active
.
p
e
rl:
factor ou
t
repeated --re
c
o
u
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hama
n
o
t
3
701: Editing a split hunk in a
n
"add -p
"
session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add -p: 'q' should real
l
y qui
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jakub Narebski
g
it
w
e
b
: Mark
m
at
c
hed 'ctag
'
/ contents tag (?by_tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jakub Nar
e
bski
gitweb: C
h
ange the way "cont
e
n
t tags" ('
c
tags') are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jakub Narebski
g
itweb: Restructure projects list
generation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
Start 1
.
7
.
5
.
1 maintenance
t
rack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
Merge branch 'm
g
/x-y
e
ars-12
-
mont
h
s' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvai
n
Rabot
git
-
send-ema
i
l: f
i
x missing space in erro
r
message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Sto
n
e
blam
e
: tolerate bogus e
-
mail addre
s
s
e
s a bit bette
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Mat
h
i
a
s L
a
feldt
t/t
e
st-lib
.
sh:
m
inor re
a
dabilit
y
improvem
e
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jim Meyerin
g
diffcore
-
rename
.
c: avoid se
t
-but-no
t
-
u
se
d
warn
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Juni
o
C Hamano
Merge branch
'
jc/diff-irreversible-d
e
lete'
commit
|
commitdiff
|
tree
2011-04-28
Junio
C Ha
m
a
n
o
Merge
branch '
j
c/
r
ename-degrade-cc-to-c'
commit
|
commitdiff
|
tree
2011-04-28
J
unio
C
Hamano
Merge bra
n
ch 'mz/rebase
'
commit
|
commitdiff
|
tree
next