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
Junio C
H
aman
o
Merge branch 'jc
/
m
a
i
n
t-branch-mergeoptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge br
a
nch 'j
n
/maint-test-merge-verify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
n
o
Merge branch 'vh/config-interactive-singleke
y
-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
Merge b
r
anc
h
'
jc/
m
aint-add-p-over
l
apping-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'sr
/
ma
i
nt-
f
ast-import-t
i
ghte
n
-opt
i
o
n
-parsing'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
Merge branch
'dm/
h
t
t
p-c
l
eanup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
ama
n
o
Merge branch 'jn/ctags
'
commit
|
commitdiff
|
tree
2011-05-08
Junio
C Hamano
t3701: add-p-fix makes the last test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
onat
h
an Nieder
tes
t
s: teach ver
i
fy_paren
t
s to
c
heck fo
r
extra
p
a
ren
t
s
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
me
r
g
e
: make branc
h
.
<name>
.
mergeoptions
co
r
rectly over
r
id
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jona
t
han Nieder
tests: eliminat
e
unnecessary se
t
u
p
test as
s
ertions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Update draft
relea
s
e
n
otes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Ham
a
no
M
erg
e
b
ranch 'j
n
/r
u
n-comm
a
nd-error-f
a
ilure'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Haman
o
Merge branch 'js/info-ma
n
-pa
t
h'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge branch 'im/hashc
m
p-op
t
im'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Merge branch 'jk/merge-on
e
-file-working-tree'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge branch 'jc/fix
-
dif
f
-files-unmerged'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Mer
g
e branch
'
cj/p
4
m
erge'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
M
erge br
a
nch
'
gr/cvsimport-alte
r
n
a
tive-cvs
p
ass-location'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hama
n
o
Merg
e
branch '
s
g/completion-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io
C
H
a
m
ano
Merge branch 'js/blame-parsename
'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C
H
a
mano
Merge branch
'
j
k
/format-patch-quo
t
e-special-i
n
-from
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
M
e
r
ge branc
h
'nd/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Me
r
ge branch 'aw/
m
aint-rebase-
i
-p-no-f
f
'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io
C
Hama
n
o
Mer
g
e
branch 'mg/alias
-
e
x
pose-pref
i
x'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Haman
o
Merge branch 'mg/diff-
u
ic
o
n
f
ig-
d
o
c
'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Ha
m
ano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-06
João Bri
t
to
Remove duplicat
e
d "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverr
e
Rabbelier
fast-im
p
ort: fix option pars
e
r for no-arg
option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C
H
amano
M
e
r
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-05
Valentin
Hae
n
el
git-reset
.
txt
:
b
e
t
t
er 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
V
alenti
n
H
aenel
git-
c
heckout
.
tx
t
: better docs f
o
r '--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
Valent
i
n Hae
n
el
git-st
a
s
h
.
txt: better 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
Valentin Haenel
git-ad
d
.
txt: do
c
umen
t
'interac
t
ive
.
singlekey'
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
t
in
H
aenel
config
.
txt: 'inte
r
active
.
s
inglekey; is
used by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C Hamano
t3701: fi
x
here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Grube
r
git-
f
ast-import
.
txt:
-
-
rel
a
tive-marks takes no par
a
meter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sh
a
rov
s
h
ell: a
d
d mi
s
sing
i
ni
t
ializ
a
tion of
a
rgv0_p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Br
i
an
G
ernhardt
t/annotate-
t
ests: Use e
c
h
o &
cat instead of
s
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Hama
n
o
Update draf
t
release
n
otes
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
er
g
e branch
'
ml/
t
est-r
e
a
dme'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
Haman
o
Merge b
r
anch '
f
t/gitweb-tar-with-
g
zip-n'
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io
C Haman
o
M
erge branch 'mg/re
v
-
l
ist-cou
n
t
-
cherry'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merg
e
br
a
nc
h
'
s
s/d
o
c-svn'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branch 'jn/f
o
rma
t
-p
a
tch-doc'
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
M
e
r
ge
branch 'vr/me
r
ge-
b
a
se-
d
oc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
M
erge
b
r
anc
h
'ss/ch
e
rry-pick-x-doc
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
g
e branch 'j
n
/maint-format-patch-doc'
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Ham
a
no
Merge br
a
n
c
h '
j
k/
f
o
r
mat-patch-multiline-header'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ha
m
ano
Merge branch '
j
m/mergetool-s
u
bmodu
l
e
s
'
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ham
a
no
Sync with
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branc
h
'
j
h/di
r
stat' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
r
ge bra
n
ch
'
sp/maint-cl
e
ar-postfiel
d
s' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
M
erge b
r
anch
'
j
k/maint-st
a
sh-oob'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ha
m
an
o
Merge b
r
anch 'j
k
/
m
ain
t
-u
p
lo
a
d-pack-shallow' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branch
'dm/stash-k-i-p' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge branch
'jc/pack-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
ama
n
o
Merg
e
branch 'mg
/
reflog-wi
t
h-options
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge
branch '
j
k/stash
-
l
oosen-safe
t
y
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch 'ar/clean-rmdir-emp
t
y'
i
nto m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
am
a
no
Mer
g
e branch 'mg/sha1-path
-
a
dvise' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Valenti
n
H
aenel
gi
t
-add
.
txt:
document 'ad
d
.
ignoreEr
r
ors'
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 Chuan
t
554
1
-h
t
t
p-pu
s
h:
a
d
d te
s
t for chunked
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Dan Mc
G
ee
h
ttp-push: refactor
curl_easy_setup madne
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
ht
t
p-p
u
sh: u
s
e const for str
i
n
gs in sign
a
tures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Da
n
McGee
http: make curl c
a
ll
b
acks mat
c
h contracts
from curl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
J
u
n
i
o C Hamano
Update
d
raft release
note
s
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Merge br
a
nch 'j
k
/
n
o
t
es-ui-updates'
commit
|
commitdiff
|
tree
2011-05-02
J
unio C Hamano
Merge branc
h
'
a
b/i18n-
f
ix
u
p'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Merg
e
bra
n
ch 'nm/submodule-update
-
force
'
commit
|
commitdiff
|
tree
2011-05-02
Junio C H
a
mano
Merge branch 'jh/notes-add-ui'
commit
|
commitdiff
|
tree
2011-05-02
J
u
n
io C Hama
n
o
Merge b
r
anch 'nd
/
maint-s
e
t
u
p
'
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
io C Hamano
Merge branch 'm
z
/maint-rename-unmerg
e
d'
commit
|
commitdiff
|
tree
2011-05-02
J
o
n
a
t
h
an Nieder
Docu
m
entation:
c
larif
y
meaning of --html-path, --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
S
eymour
g
it: a
d
d
-
-
inf
o
-path and --m
a
n-p
a
th opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Update
draft release note
s
to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Jun
i
o C H
a
mano
M
e
r
g
e
b
ranc
h
'rs
/
st
r
buf-se
t
l
e
n-assert'
commit
|
commitdiff
|
tree
2011-05-01
Junio
C
Hamano
Merge branch 'vh/git-svn
-
do
c
'
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jes
s
u
p
Pass empty
file t
o
p4me
r
ge wh
e
r
e
no
base is suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Roui
l
lier
Look for pass
w
ord i
n
both
CVS and
CVSNT password files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
merge-one-file: fix broken
m
erges
with alternate
w
ork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff Ki
n
g
add
t
e
s
t
s for me
r
ge-index / me
r
ge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
"
add -p": work-around an old laz
i
n
ess that does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
dd--i
n
teractive
.
perl: factor out
r
epeated
--rec
o
u
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t37
0
1: Editing a split hunk in
an
"
add
-
p
"
s
ess
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
add -p
:
'
q
'
sho
u
ld
r
eall
y
quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jak
u
b Narebs
k
i
gitweb: Ma
r
k ma
t
ched
'
c
t
ag' / content
s
ta
g
(?b
y
_ta
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jakub Na
r
ebski
gitweb
:
Change the way "content tag
s
"
(
'ctags'
)
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jakub N
a
r
ebski
gitweb: R
e
s
tr
u
cture projects
lis
t
gen
e
ration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
mano
S
t
a
rt 1
.
7
.
5
.
1 m
a
i
n
tenance tr
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge
branch
'mg/x
-
years-12-months' into
m
aint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Ra
b
o
t
g
i
t
-send-email: fix missing spac
e
in
e
rror message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
osh Sto
n
e
blame: tolerate bogus e
-
mail addresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Mathi
a
s L
a
feldt
t/test-lib
.
sh: minor rea
d
a
b
ilit
y
im
p
rovements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jim Meyerin
g
d
i
ffcore-rename
.
c: avoid set-but-not-used w
a
rni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hama
n
o
Merge bran
c
h 'jc/dif
f
-
irreversible-delet
e
'
commit
|
commitdiff
|
tree
2011-04-28
Junio C H
a
man
o
Merg
e
bra
n
ch 'jc/rename-degrade-cc-to-c'
commit
|
commitdiff
|
tree
2011-04-28
Junio
C
Hamano
Merge
b
ranch 'mz/reba
s
e'
commit
|
commitdiff
|
tree
next