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
diff --check: honor conflict-marker-size attribute
2010-03-25
Jun
i
o C Hamano
d
i
ff --check:
honor co
n
flict-m
a
rker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
rerere: honor conflic
t
-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepa
r
e for cus
t
omizable conflict mar
k
er length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
H
amano
conflict-
m
arker
-
size: new attri
b
u
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
rerere:
u
se ll_merge() instead of
us
i
ng xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hama
n
o
merge-tree: use
l
l_merge() not
x
dl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Hamano
x
d
l_merg
e
(): all
o
w passi
n
g down marke
r
_size in
x
m
para
m
_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
d
l_merge(): introduce xm
p
a
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
no
git_attr(): fix function signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Ju
n
io
C Hamano
rerere forget path: forget rec
o
rded re
s
olution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C Ham
a
no
r
e
rere: refactor
r
e
rere logic to
make
it i
n
d
ep
e
ndent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
rer
e
re
:
r
em
o
ve silly 10
2
4-b
y
te line limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
resolve-undo:
t
ea
c
h
"
up
d
ate-index --
u
nresolve" to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
resolve-undo: "
c
heckout
-
m path" u
s
es
resolve-und
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
e
sol
v
e
-und
o
: allow pl
u
mbing to clear the information
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Haman
o
r
e
s
olve-undo: ba
s
ic tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resol
v
e-undo: recor
d
resol
v
ed co
n
flicts in a new index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
b
uiltin-merge
.
c: use standard active_c
a
che macros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
J
u
nio C Ha
m
ano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
J
un
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Junio 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
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Hamano
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
i
o
C Hamano
Merge branc
h
'maint' to sync w
i
th 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Ham
a
no
wor
k
t
r
e
e: don't segfault with an absolute pathspe
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C Hamano
Up
d
ate
Release Notes for 1
.
6
.
6 t
o
remove old b
u
gfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C Hamano
Sync with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
man
o
Fix archive forma
t
w
ith -- on
t
he co
m
mand line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remove
p
o
st
-
u
p
load-ho
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Ham
a
no
Git 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge git://repo
.
or
.
cz
/
g
it-gui
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C
Hamano
Merge git://git
.
k
ernel
.
org/pub/s
c
m/g
i
t
k
/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ha
m
ano
U
p
date draft r
e
lease notes to 1
.
6
.
6 befo
r
e -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Ha
m
ano
M
e
r
g
e
branch 'mm/mai
n
t-m
e
rge-ff-error-messa
g
e-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge branch
'
jn
/
m
a
in
t
-pull-rebase-
e
r
r
or-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
ma
n
o
Merge b
r
anch 'jk/mai
n
t-add
-
p-de
l
ete
-
fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C H
a
mano
Merge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert recent
"g
i
t m
e
rge <
m
sg> HEA
D
<
c
ommit>
.
.
.
"
de
p
re
c
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C Hamano
Sync with 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
H
amano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Ha
m
a
n
o
P
r
epare for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ham
a
no
M
e
rge branch
'uk/
m
aint-sho
r
t
l
og-encod
i
n
g
' into
main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'fc/maint
-
format-patch-
p
a
t
hspec-dash
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'ap/maint-merge-stra
t
egy-list-
f
ix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge b
r
anch 'jc/m
a
i
nt-a
m
-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
r
s
/work-around-grep
-
opt
-
insanit
y
' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
e
r
ge branc
h
'rj
/
maint-
c
ygwin-
c
ount-objects'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
Merge branch 'mm/m
a
int-hint-failed-
m
erge' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h
'th/maint
-
r
e
m
o
te
-
update-he
l
p-s
t
ring'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge
b
ranch
'
r
j/maint-
t
9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Merge b
r
anc
h
'ls/mai
n
t-mailinfo-no-inbody' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge bra
n
ch 'mo/main
t
-crl
f
-doc
'
i
nto main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'th/
r
emote-usage' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
M
e
r
ge branch 'pb/maint-use-custom-p
e
r
l' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
ama
n
o
Merge branch
'mm/
c
onfig-pathnam
e
-
ti
l
de
-
expan
d
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
man
o
Merge bra
n
ch
'
bc/
g
rep-i-F' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
erge branch '
j
k/maint-brea
k
-
r
ename
-
reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch
'
rj/maint-simplify-cygwi
n
-make
f
il
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'rg
/
doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'np/maint
-
sideb
a
nd-
f
a
vor-s
t
atus'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
a
n
o
Documentation:
x
mlto 0
.
0
.
1
8
d
o
e
s
not know --stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Ham
a
n
o
Merg
e
in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o 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
Unconditionall
y
set man
.
base
.
url
.
for
.
relative
.
li
n
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git 1
.
6
.
6-rc
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C
H
amano
Prep
a
re for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merge: do not a
d
d st
a
nd
a
rd me
s
sage when messag
e
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Hamano
D
o n
o
t m
i
side
n
tify "git merge foo
H
EAD" as an old-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
unio
C H
a
man
o
Update
dr
a
ft release note
s
to 1
.
6
.
6
b
efore
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Hamano
Merge b
r
anc
h
'jc/
d
eprecate-ol
d
-syntax-
f
r
o
m-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-merge
:
a
de
p
recation no
t
i
c
e of the ancient command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io
C
Hamano
M
erge b
r
anch 'bw/remote-get-ref-
s
t
ates-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Ha
m
ano
Merge
b
ranch 'jn/gitwe
b
-
blame'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C
Hamano
Merge br
a
nch
'fc/maint-format-patch-path
s
p
e
c
-
d
a
sh
e
s'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C
H
aman
o
Merge b
r
anch 'mm/maint
-
merg
e
-f
f
-error-me
s
s
a
ge
-
fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bra
n
ch 'ap/maint-merge-
s
trategy-
l
ist-f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge bra
n
c
h 'j
c
/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
Me
r
ge br
a
n
c
h '
c
c/b
i
sect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
ma
n
o
Merge branch
'
em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
M
erge b
r
an
c
h 'jc/mailinfo-remove-bracket
s
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
am
a
no
M
e
rge
branch
'fc/se
n
d-
e
mai
l
-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C
Haman
o
Merge branch '
u
k/m
a
int-
s
hor
t
log-enco
d
ing'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'
ns/sen
d
-
e
ma
i
l-no-chain-re
p
ly-to
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge bra
n
ch 'j
c
/m
a
i
n
t-
a
m
-keep'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C
Ham
a
n
o
Me
r
ge branch 'bw/
d
if
f
-
color-hu
n
k-header
'
commit
|
commitdiff
|
tree
2009-11-28
Juni
o
C Ha
m
ano
Up
d
ate
d
raft
rel
e
ase
n
o
t
es to 1
.
6
.
6
b
e
fore merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio
C
H
am
a
no
emit_line(): don't emit
a
n
empty <SET><R
E
SET> f
o
llow
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Hamano
Remove dead code from "gi
t
am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
builti
n
-ap
p
ly
.
c: p
a
y attentio
n
to
-
p
<
n> w
h
en determining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Ham
a
no
M
erge
branch 'rs/work
-
ar
o
und-grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C
Ha
m
ano
Merge branch '
r
j/
m
a
int-cygwin
-
count-obje
c
t
s'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C Hamano
M
erge
b
ranch
'rs/
c
olor-esca
p
e-has-ze
r
o-width'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C H
a
mano
Merge
b
ranch 'b
g
/apply-doc'
commit
|
commitdiff
|
tree
next