repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
conflict-marker-size: add test and docs
2009-12-09
Junio C Hamano
U
p
date
dra
f
t relea
s
e notes to 1
.
6
.
6 before -
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
i
o
C
Hamano
M
e
rge bra
n
c
h
'm
a
in
t
'
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
aman
o
Merge branch
'mm
/
maint-
m
erge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge branch 'jn/main
t
-
pull-r
e
base-er
r
or-message'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C
Hamano
Merge branch 'jk/maint-add-p-delete-fix' into
maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
J
unio C Ha
m
a
n
o
Re
v
ert recent
"
git merge <msg> HEAD <commit>
.
.
.
"
deprecat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-07
Junio C
Hama
n
o
M
erg
e
branch 'ma
s
ter' into il/vc
s
-helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sy
n
c with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Haman
o
Gi
t
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Junio C Hamano
Teach
-
-
[
no
-
]rerere-
a
uto
u
pdate
option t
o
me
r
ge, reve
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Prepare f
o
r 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'uk/maint-
s
hortlog-en
c
oding' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge bran
c
h 'fc/m
a
i
nt-form
a
t
-pa
t
ch
-
pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'ap/maint-me
r
ge-strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Haman
o
Me
r
ge branch 'jc/mai
n
t-am-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch
'
rs/wor
k
-around-grep-opt-
i
nsanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge bra
n
ch
'
rj/maint-cygw
i
n-count-objects'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Me
r
g
e b
r
anch 'mm/
m
ai
n
t-hi
n
t-fail
e
d-merge' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Haman
o
Merge br
a
nch
'
t
h/maint-remote
-
update
-
help-stri
n
g
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'r
j
/
m
a
int-t9
7
00' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ha
m
ano
M
erge
b
ranch
'
ls/maint-mail
i
nfo-no-inbody
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'mo/maint-crlf-doc' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
Merge branch
'
th/r
e
mot
e
-usage' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Haman
o
Merge branch 'pb/maint-use-cu
s
t
om-perl' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
n
c
h 'mm
/
config-pathname-tilde-e
x
pand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
ano
Merge branc
h
'bc/grep-i
-
F' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'jk/maint-break-rename-reduce
-
memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch 'rj/m
a
int-si
m
p
l
ify-c
y
g
w
in
-
makefi
l
e
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C H
a
mano
Merge branch
'
r
g/doc-workflow' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
e
rge
branch
'
np/m
a
i
n
t-
s
i
d
eban
d
-favor-
s
tatus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documenta
t
i
on: xmlto
0
.
0
.
18 does not know
--s
t
r
i
ngparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Unconditional
l
y s
e
t
m
an
.
ba
s
e
.
ur
l
.
f
o
r
.
re
l
ative
.
l
inks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Documen
t
at
i
on/Ma
k
efile: allow man
.
base
.
url
.
for
.
r
e
l
a
tive
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
a
man
o
Git 1
.
6
.
6-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
aman
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-02
J
u
ni
o
C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
m
erge: do
not
add stan
d
a
r
d message w
h
en me
s
sage is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C
H
a
ma
n
o
Do n
o
t mi
s
ident
i
f
y "git mer
g
e foo HE
A
D"
as
a
n
old-styl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
U
p
dat
e
dr
a
ft relea
s
e
notes t
o
1
.
6
.
6
before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Hamano
Merge bra
n
c
h 'jc/depr
e
cate-o
l
d-syntax-
f
rom-merge'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Ha
m
ano
git
-
merge
:
a deprecation notice of the anc
i
ent com
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io
C H
a
mano
Merge branch 'bw/remote-get
-
r
ef-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
Hamano
M
e
r
ge branch
'jn/gitw
e
b-bla
m
e'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Haman
o
Merge branch 'fc/maint-format-patch-pathspec-d
a
she
s
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C
Hamano
Merge branch 'mm/
m
aint
-
m
erg
e
-ff-error-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C H
a
mano
Merge
b
ranch 'ap/maint-
m
erge-strat
e
gy-li
s
t-fix'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
Mer
g
e branch 'jc/pre
t
ty-lf
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Mer
g
e branc
h
'cc/b
i
sect-doc'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io
C
H
a
mano
Merge branc
h
'
em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Merge b
r
anch 'jc/mailinfo-re
m
ove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'fc/send-email-env
e
l
o
pe'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Haman
o
M
e
r
ge
b
ranch 'uk/mai
n
t-shortlog-en
c
oding'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o C Hamano
M
erge
bra
n
ch 'ns/send-email-no-
c
hain-
r
eply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'jc/m
a
int-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Mer
g
e branch 'bw/d
i
ff-col
o
r-hunk
-
header'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io C H
a
m
a
no
g
it-
m
erge
-
file --ours, --theirs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io C Haman
o
Merge
r
emote branch 'ko/master
'
int
o
H
E
AD
commit
|
commitdiff
|
tree
2009-11-28
Ju
n
io C
H
a
mano
Upd
a
t
e
draft rel
e
ase notes t
o
1
.
6
.
6 before merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Ham
a
no
emit_line(): don
'
t emit an empty <SET><R
E
SET> f
o
llowe
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
unio C Haman
o
Remove
d
ead code from "git
a
m"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
Hamano
Me
r
ge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
J
unio C Hamano
builtin-apply
.
c: p
a
y attention to
-p<n>
wh
e
n det
e
rmining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Ha
m
ano
M
erge b
r
anch '
r
s/work-aroun
d
-grep-opt-insa
n
ity'
commit
|
commitdiff
|
tree
2009-11-24
Juni
o
C Hamano
Merge branch 'rj/mai
n
t-cygw
i
n-count-
o
bjects'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Haman
o
Merge branch 'rs/color-escape-h
a
s-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Hamano
Me
r
ge branch 'bg/apply-d
o
c'
commit
|
commitdiff
|
tree
2009-11-24
J
unio C Hamano
Merge
branc
h
'mm/maint-hin
t
-failed-merge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ham
a
no
Merge branch 'jc/lo
g
-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ha
m
a
n
o
Merge branch
'
mr/git
w
eb-snapshot
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
Merge
b
ra
n
c
h
'cc/re
p
lace'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
i
o
C Hamano
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Ha
m
ano
Protect
scr
i
pt
e
d
Porcelains
f
rom
GR
E
P_OPT
I
ONS insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Add tr
i
vial tests fo
r
--stdin option to l
o
g family
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Haman
o
Merge branch 'b
g
/fetch-mul
t
i'
commit
|
commitdiff
|
tree
2009-11-23
Ju
n
io C Haman
o
Git v1
.
6
.
6-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hama
n
o
Merge b
r
a
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
H
amano
Me
r
ge git://git
.
bogom
i
ps
.
org/git-svn
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ha
m
ano
Merge b
r
a
n
c
h
'
t
h/maint-remote-update-help-string'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
amano
Merge branch 'jn/fast
e
r
-comp
l
etion-start
u
p'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branc
h
'rj/mai
n
t-t9700'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C
Hamano
Merge branch 'ls/
m
aint-ma
i
linfo-no
-
inbody'
commit
|
commitdiff
|
tree
2009-11-23
J
unio C
H
amano
Me
r
g
e
b
ra
n
c
h 'mo/maint-cr
l
f-doc'
commit
|
commitdiff
|
tree
2009-11-23
J
uni
o
C
H
amano
Merge branch 'th/re
m
o
t
e-us
a
ge'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Hamano
Merge br
a
n
c
h
'pb/ma
i
nt-use-cus
t
om-
p
erl'
commit
|
commitdiff
|
tree
2009-11-23
J
u
ni
o
C
H
amano
Merge b
r
anc
h
'
m
m/
c
onfig-pathnam
e
-tilde-expand'
commit
|
commitdiff
|
tree
2009-11-23
Junio
C Ha
m
ano
Merge branch
'
bc
/
grep-
i
-
F
'
commit
|
commitdiff
|
tree
2009-11-23
J
u
nio C
H
amano
M
e
rge bra
n
ch 'jk/maint-break-
r
ename-
r
educe-
m
emo
r
y
'
commit
|
commitdiff
|
tree
2009-11-23
Junio C
Hamano
Merge branch 'tc/format-attri
b
u
t
e'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Mer
g
e
br
a
n
ch 'tr/maint-merge-ou
r
s-clarification' (early
.
.
.
commit
|
commitdiff
|
tree
2009-11-22
J
u
nio C
H
amano
t9001: te
s
t
--envelope-s
e
n
d
er option
o
f send
-
emai
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ha
m
ano
"rebase --onto A
.
.
.
B" r
e
p
lays histor
y
on t
h
e m
e
rg
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Documentation: a
v
o
id xml
t
o
in
p
ut
error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branc
h
'jc/fix-
t
ree-wa
l
k
'
(
early
part)
commit
|
commitdiff
|
tree
2009-11-21
J
un
i
o C Hamano
Merg
e
branch 'jh/
n
o
tes' (early
part)
commit
|
commitdiff
|
tree
next