repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: honor conflict-marker-size attribute
2010-01-17
Junio C Hamano
r
erere: hono
r
conflict-marker-si
z
e attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
rerere: pre
p
are for cu
s
tomiza
b
l
e conflict marker leng
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io
C
Ha
m
ano
conf
l
ict-m
a
rker-size:
new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Haman
o
r
e
rere: use ll_merge() i
n
s
t
ea
d
o
f u
s
ing
xdl_me
r
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
m
erge-
t
ree: use
l
l_merge()
n
ot xd
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
x
d
l_merge(): allow pa
s
sing
d
o
wn marker_size
i
n xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
xdl_merg
e
(): introd
u
ce xmpa
r
am_t for merge sp
e
cific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
git_attr(
)
: f
i
x fu
n
cti
o
n signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C
Hamano
rerere forge
t
path: forget rec
o
r
d
ed resolution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
r
erere: refactor rerer
e
logic
t
o make it indepen
d
ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
rerere: remo
v
e silly 1
0
24-byte line
l
imit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
resolve-undo
:
tea
c
h "upd
a
t
e-index --unre
s
olve" to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C
Hama
n
o
resolv
e
-undo: "
c
heckout -m path" u
s
es re
s
ol
v
e-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hama
n
o
resolve
-
undo: allow plumbing to clea
r
the informatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
re
s
olve
-
undo: basi
c
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C Ha
m
a
no
resolve-undo: recor
d
resolved confl
i
cts in a new index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
un
i
o C Hama
n
o
bui
l
tin-merge
.
c: use
s
tandar
d
a
ctive_cache mac
r
os
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C H
a
mano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-20
J
u
n
io C Hamano
Git
1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C Ha
m
an
o
G
i
t 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hamano
Merge
branch 'main
t
'
to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hama
n
o
G
it 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
wo
r
ktree: don't segfault with an ab
s
o
l
ute pa
t
h
s
pec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C Ha
m
ano
Update Rel
e
ase Notes f
o
r 1
.
6
.
6 to remov
e
old bugfix
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C Ham
a
no
Syn
c
with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hamano
G
it 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Hamano
Fix archive format with
-- on t
h
e comma
n
d
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
Hamano
Remove post-u
p
l
o
ad-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
amano
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Haman
o
M
e
r
g
e git://git
.
ker
n
el
.
or
g
/pu
b
/scm/gitk/git
k
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C Hamano
Update draft re
l
ease notes to
1
.
6
.
6 before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Me
r
ge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Ham
a
no
M
erge branch 'mm/main
t
-
m
e
rge
-
ff-er
r
or-me
s
sage-fi
x
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merge
branc
h
'j
n
/maint-pull
-
rebase-erro
r
-
messag
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
no
Merge branch 'jk/maint-ad
d
-p-delete-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
J
un
i
o
C
Ha
m
ano
Merge git://git
.
bogom
i
ps
.
org/git
-
sv
n
commit
|
commitdiff
|
tree
2009-12-08
J
unio C
H
a
mano
Reve
r
t recent "git merge <msg> HEA
D
<commit>
.
.
.
" d
e
precation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Juni
o
C Hamano
Sync w
i
th 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
u
ni
o
C
H
a
mano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Prepar
e
for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e
bra
n
ch
'
uk/maint-shortlog-enc
o
di
n
g' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
mano
Merge branch 'fc
/
m
a
i
n
t
-format-pat
c
h-pathspec-d
a
shes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge bran
c
h
'a
p
/maint-merge-s
t
ra
t
e
gy-l
i
st-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Hamano
Merge b
r
anch 'jc
/
m
aint-am-keep' into
m
a
in
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'rs/work-aroun
d
-grep-
o
pt-ins
a
ni
t
y' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
a
n
o
Merge
b
ranch 'rj/maint-cygwi
n
-count-ob
j
ects'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge br
a
nch
'mm/maint-hint-failed-merge' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
ama
n
o
Merge branch 'th/maint-remote-update-help-string'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Mer
g
e
bran
c
h 'rj/
m
ain
t
-t97
0
0' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'ls/
m
aint
-
mailinfo
-
no-inbody' i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'mo
/
maint-crlf-doc'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'th/remote
-
usage' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch '
p
b/maint-u
s
e-custom-p
e
rl' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'mm/c
o
nfig-pathna
m
e-ti
l
de-expa
n
d' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C H
a
mano
Merge bra
n
ch 'bc/
g
rep-i-F' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'jk/main
t
-
break-ren
a
me-reduce-me
m
ory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
ano
Me
r
ge
branch 'rj/ma
i
n
t-simplify-
c
yg
w
in-make
f
ile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
Merge branch 'rg/doc-wor
k
flow' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branc
h
'np/maint-
s
ide
b
and
-
favor-status'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Doc
u
m
e
n
t
ation:
x
m
l
t
o 0
.
0
.
18 do
e
s not
k
now
--stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ha
m
ano
Merg
e
in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C
H
aman
o
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Uncondi
t
ionall
y
set man
.
base
.
url
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
D
o
cumentation/
M
akefile: al
l
ow
man
.
base
.
url
.
for
.
relativ
e
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C
H
a
mano
Git 1
.
6
.
6-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ham
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Hama
n
o
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
m
ano
merge: do not
add standard message
w
hen message
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
i
o
C Hamano
Do not mi
s
i
dentify "gi
t
m
e
rge foo
HEAD" as an
old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update draf
t
r
e
lease n
o
tes to
1
.
6
.
6 bef
o
re -
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hama
n
o
Merge branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
Merge br
a
nch 'jc/dep
r
ecate-
o
ld-synt
a
x
-
fr
o
m-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
g
i
t-merge: a dep
r
ecati
o
n notice of the anci
e
nt command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merge branch 'bw/remote-
g
et-ref-sta
t
es-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
Merg
e
bra
n
c
h
'
j
n/gitweb-bla
m
e'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge
b
ranch 'fc/maint-format-patch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
n
o
Mer
g
e branch 'mm/m
a
int-merge-f
f
-er
r
o
r
-message-f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
Merge branch 'ap/ma
i
n
t-
m
erge-st
r
a
t
egy-list-fi
x
'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C Hamano
Merge br
a
nch 'j
c
/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Haman
o
Merge branch 'cc/bisect-
d
o
c
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
M
erge
b
ranch 'em/comm
i
t-claim'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io C Hamano
Merge branch '
j
c/mailinfo-remov
e
-brackets'
commit
|
commitdiff
|
tree
2009-11-30
J
uni
o
C
H
a
mano
Merg
e
b
r
anch 'f
c
/s
e
nd-email-env
e
l
o
pe'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
Merge branch 'uk/maint-sh
o
rt
l
o
g-encoding'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C Hamano
Merge branch 'ns/
s
end-email-no-ch
a
in-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C Hamano
M
erge bra
n
ch
'jc
/
maint-am-kee
p
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bran
c
h 'bw/di
f
f-color-hunk-h
e
a
d
e
r
'
commit
|
commitdiff
|
tree
2009-11-28
Ju
n
io C
H
amano
Update draft release notes
t
o 1
.
6
.
6
befor
e
merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hama
n
o
emit_line():
d
o
n't emit an empty <SET><RESET> followe
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
Hamano
Remo
v
e dead code from "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
Hamano
Merge b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2009-11-27
J
unio C
Hama
n
o
built
i
n-apply
.
c: pay attention to -
p
<n>
when determini
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hamano
M
e
rg
e
branch 'rs
/
work-ar
o
und-grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Hamano
Merg
e
branch 'rj/maint-
c
ygwin-count-objects
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Haman
o
Merge
b
ranch
'
rs/c
o
lor-e
s
cape-has-zero-wi
d
th'
commit
|
commitdiff
|
tree
next