repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert recent "git merge <msg> HEAD <commit>..." deprecation
2009-12-08
Junio C Hamano
Re
v
e
rt rec
e
nt "git merge <msg> HEAD <commit>
.
.
.
"
d
eprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C Ham
a
no
S
y
nc
w
ith 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
u
n
io C Hamano
G
it
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge bra
n
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Prepare for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
ma
n
o
M
erge
b
ranch 'uk/
m
a
i
nt-shortlog-e
n
coding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'fc/
m
aint-format-patch-pat
h
s
p
ec-da
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
er
g
e
branch 'ap/maint-merge-stra
t
e
gy-list-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hamano
M
e
rge branch '
j
c/ma
i
nt-am-keep' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Me
r
ge branc
h
'rs/work
-
around-grep-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
a
no
Merge
b
ranch 'r
j
/maint-cygwin
-
count
-
ob
j
ects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branc
h
'mm
/
maint-hint-fai
l
ed-merge
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
Merge branch '
t
h/main
t
-remo
t
e-u
p
date-
h
elp-strin
g
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
erge branch
'rj/maint
-
t9700' i
n
to main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge bra
n
ch '
l
s/maint-m
a
ili
n
fo-no-inb
o
dy' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Merge branch
'mo/maint-
c
rlf-doc'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
ano
Merge branch 't
h
/remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Merge branch
'pb/ma
i
nt-
u
se-cus
t
om-perl' into
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
H
a
mano
Merge bran
c
h 'm
m
/co
n
fig
-
pathname-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C H
a
mano
Merge
branch
'
bc/
g
rep
-
i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'jk/maint-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
ano
Merge bra
n
ch
'rj/maint-simp
l
ify-cyg
w
in
-
makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hama
n
o
Merge b
r
anch 'rg/doc-workfl
o
w'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch
'
np/main
t
-
sideband-fa
v
or-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Document
a
tion: x
m
lto 0
.
0
.
18 does
not kno
w
--stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Uncondi
t
ionally set man
.
base
.
url
.
for
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C
Hamano
Gi
t
1
.
6
.
6
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hama
n
o
P
r
epar
e
f
o
r 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o
C
Hamano
merge: do n
o
t
add stan
d
a
rd messa
g
e
when mess
a
ge is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Do
n
ot
misidentify
"git merge foo H
E
AD"
as an old-st
y
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update draft rel
e
ase notes to
1
.
6
.
6 befo
r
e -r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Mer
g
e bran
c
h 'jc/
d
e
p
recate-ol
d
-syntax-from-merg
e
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-mer
g
e: a deprecation no
t
ic
e
of the an
c
ie
n
t command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Ham
a
no
Merge b
r
anch 'bw/remote-
g
e
t-ref-
s
tates-fix
'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
Mer
g
e
b
r
a
n
ch 'jn/gi
t
web-blame'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'fc/maint-format-p
a
tch-
p
athspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
M
erge
b
ranch 'mm/m
a
int-merge-ff
-
erro
r
-
m
essag
e
-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'ap/ma
i
nt-merge-strategy-list-f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge
b
r
anch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o C Hama
n
o
Merge branch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C H
a
mano
M
erge bra
n
ch 'em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
M
erge
branch 'jc/mailinfo-remove-bracket
s
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
man
o
M
e
rg
e
branch 'fc/send-email-
e
nvelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
M
e
rge
branch 'uk/maint
-
shortlog
-
encoding'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
H
amano
Merge branch 'ns/send-email-
n
o
-chain-repl
y
-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge b
r
anch 'jc/maint-am-k
e
ep'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
M
e
rge branch 'b
w
/d
i
ff-color-hunk-head
e
r
'
commit
|
commitdiff
|
tree
2009-11-28
Junio C Haman
o
Update
d
r
a
f
t release note
s
to 1
.
6
.
6 before merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Ju
n
i
o
C
H
amano
e
mit_line(): don't emit an empty <S
E
T><RESE
T
>
f
o
l
lowed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
J
un
i
o C H
a
mano
Remove d
e
a
d
c
ode from "g
i
t am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
J
unio C
H
amano
bu
i
ltin-a
p
ply
.
c
:
pay a
t
t
e
ntion to -p
<
n> when det
e
rmi
n
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Ju
n
io C Hamano
M
erge bran
c
h
'
r
s/work-
a
round-gr
e
p
-op
t
-insanity'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Hamano
Merge branch 'rj/m
a
i
n
t-cygwin-coun
t
-o
b
ject
s
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Mer
g
e br
a
nch 'rs/color-escape-
h
a
s
-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Hama
n
o
Merge br
a
nch 'bg
/
app
l
y-
d
oc'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio
C
H
aman
o
Merge
b
ranch
'mm/maint-
h
i
nt-fail
e
d-merg
e
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
Merge
branch
'
jc/log
-
stdin'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Haman
o
Merg
e
branc
h
'mr/
g
itweb-snap
s
hot
'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Ham
a
no
Merge
b
ranch 'cc/repla
c
e'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
H
amano
Merge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ha
m
ano
P
r
otect scripted Porcelains from GREP_OPT
I
O
NS insanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Add t
r
ivi
a
l te
s
ts fo
r
--
s
tdin option to log
f
amily
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
io C Haman
o
Mer
g
e branch 'bg/fetc
h
-multi'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Hamano
Git v1
.
6
.
6-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Hamano
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Ham
a
no
Merge git
:
//git
.
bogomips
.
org/g
i
t-
s
vn
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
Merge branch
'
t
h/
m
a
in
t
-remote-
u
pdate-help-string'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
Merge b
r
anch 'jn/faster-completion-startup
'
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o
C Ha
m
ano
Merge branch 'rj
/
maint-t9700'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
M
e
rge
b
r
anc
h
'ls/maint-ma
i
linfo
-
n
o
-inbo
d
y'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Hama
n
o
Merge b
r
anch 'mo/maint-cr
l
f-d
o
c'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
amano
Merge branch 'th/remote-usage'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
Merge bran
c
h 'p
b
/maint-use-custom-perl'
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
Merge branch 'mm/co
n
fig
-
p
a
thname-tild
e
-
e
x
p
and'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ham
a
no
M
e
rge br
a
n
c
h '
b
c/grep-i-F
'
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
Merge b
r
anch '
j
k/ma
i
nt-break-rename-reduce-memor
y
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Hamano
Merge branch 'tc/format-
a
ttribute'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Haman
o
Merge branch 'tr/maint-mer
g
e
-ours-clarificati
o
n' (ea
r
ly
.
.
.
commit
|
commitdiff
|
tree
2009-11-22
Junio C H
a
mano
t9001: tes
t
-
-e
n
velope-sender opt
i
on
o
f send-
e
mail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Documentation
:
avoid xmlto inp
u
t error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Hamano
Merge br
a
nch 'jc/fi
x
-tree-walk' (early part)
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Hamano
Merge branch 'jh/notes'
(
early part)
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hama
n
o
M
e
r
ge branch
'
sp/sma
r
t-http'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branch '
b
w/aut
o
conf-more'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge br
a
nch 'jn/editor
-
pager'
commit
|
commitdiff
|
tree
2009-11-21
Juni
o
C
Hamano
M
e
rge branch 'rj/cyg
w
in
-
m
s
vc'
commit
|
commitdiff
|
tree
2009-11-21
Junio C
H
amano
Merge b
r
anch 'rj/maint-si
m
p
li
f
y-cygwin-makefile'
commit
|
commitdiff
|
tree
2009-11-21
J
u
n
io C Hamano
Mer
g
e branch 'bg/format-patch-
d
o
c
-update'
commit
|
commitdiff
|
tree
2009-11-21
J
u
nio C
Hamano
M
e
r
ge b
r
a
nch 'tr/fil
t
er-branch'
commit
|
commitdiff
|
tree
2009-11-21
J
uni
o
C
H
amano
Merge branch 'sc/protocol
-
d
oc'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ha
m
ano
Merge bra
n
ch 'jl/submodule-a
d
d-noname'
commit
|
commitdiff
|
tree
2009-11-21
Juni
o
C Hamano
Merge branch 'sb/l
s
-tree-parseopt'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge
b
ranch 'rg/doc-workflow'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hama
n
o
Merge branch 'j
n
/
g
itweb-
l
og-hi
s
tor
y
'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Hamano
Merge branch 'jn/help-
e
ve
r
y
where'
commit
|
commitdiff
|
tree
next