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
J
u
nio C Hamano
diff --check:
h
on
o
r
conflict-marker-s
i
ze att
r
i
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
rerere
:
h
o
nor con
f
l
i
ct-marker-s
i
ze attribu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: pr
e
p
ar
e
for customiza
b
le c
o
nflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Ham
a
no
co
n
flict-marker-
s
ize: new
a
ttribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
rerere: use
l
l_merge
(
) i
n
stead of usi
n
g xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
ano
merge-tree: use ll_merg
e
() not xdl_merg
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_me
r
ge(
)
: allow
p
assing
down marker_size i
n
x
mpa
r
am_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): introduce xmparam_t for me
r
g
e
s
p
e
c
ific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
ano
git_attr(): fix
function signatu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C
Hamano
rer
e
re forge
t
pa
t
h: forget recorded res
o
lution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Ham
a
no
r
e
rere: refactor rerere
logi
c
to make it in
d
epende
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
rerere: r
e
move sil
l
y
1
024-byte l
i
ne limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
reso
l
ve-
u
ndo
:
teach "u
p
dat
e
-
i
ndex --
u
nr
e
solv
e
" to
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Hamano
re
s
o
l
ve-undo: "checkout -m path" uses resolve-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C
Hama
n
o
re
s
o
lve-
u
ndo: allow plum
b
ing t
o
clear the
info
r
mation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio
C
H
amano
resol
v
e
-
undo:
b
asic te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
r
esolve-undo: record resolved con
f
licts in
a
new
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
builtin
-
me
r
ge
.
c: use sta
n
dard acti
v
e_cache macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
J
u
nio C Hamano
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Ham
a
no
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-20
Juni
o
C Ham
a
n
o
G
it 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
H
a
mano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-16
Junio C
Hamano
G
it
1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Haman
o
M
e
r
g
e branch 'ma
i
nt' to
s
y
nc with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hama
n
o
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
w
o
rktree:
don't
segfault with a
n
a
bso
l
u
t
e pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C
H
am
a
no
Update
R
e
l
e
ase Notes for 1
.
6
.
6 t
o
remove old bugf
i
xe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o C
H
ama
n
o
Sync
w
ith 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 Hamano
Fix arch
i
ve format with -- on the com
m
and line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Rem
o
ve post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merge git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git
.
kernel
.
o
r
g/
p
ub
/
sc
m
/gi
t
k
/
g
it
k
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Updat
e
d
r
aft rele
a
se 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
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Mer
g
e
b
ranc
h
'
mm/maint-merge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
a
m
ano
Merg
e
branch '
j
n/mai
n
t-pu
l
l
-
reba
s
e-error-message' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Ham
a
n
o
Merge branc
h
'jk/maint-a
d
d-
p
-delete-fix' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
Merge git://git
.
bogom
i
ps
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Ha
m
ano
Reve
r
t
recen
t
"git merge <msg>
H
E
AD <commit
>
.
.
.
" deprec
a
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C
Hama
n
o
S
y
nc with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ham
a
no
G
it 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
M
erge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
H
a
m
a
n
o
Prepare
fo
r
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C H
a
m
a
no
Merg
e
branch 'uk/m
a
int-sh
o
rtlog-encoding'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ha
m
a
no
M
erge branch
'fc/mai
n
t-format-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'ap/maint-
m
e
r
g
e-strategy-
l
ist-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch 'j
c
/maint-am-keep' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
erge
b
r
anch
'r
s
/
w
or
k
-ar
o
und-grep-opt-i
n
sanity' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
Ham
a
no
Merge branch 'rj/maint-cygwin-count-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Hamano
Merge branch 'mm/maint-hint-failed-mer
g
e
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
M
e
r
ge branch 'th/maint-remote-update-help-string
'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
Merge branch 'rj/maint-t9700' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
ma
n
o
M
erge b
r
a
n
c
h
'ls
/
maint-mailinfo-no-inbody' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branc
h
'mo/maint-crlf-doc' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'th
/
remote-usag
e
' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'pb/maint-use-c
u
stom-pe
r
l' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erg
e
bran
c
h 'm
m
/confi
g
-pathname-tilde-expand' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hamano
Merg
e
branc
h
'bc/grep-i-
F
' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ham
a
n
o
Merge branch
'jk/mai
n
t
-break-re
n
ame-reduce
-
memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C H
a
ma
n
o
Merge
b
ranch 'r
j
/
m
aint-
s
implif
y
-
c
y
gwin-makefile
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch '
r
g/doc-workflow
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
mano
Mer
g
e branch 'np/ma
i
nt-sid
e
band-favo
r
-status
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentat
i
on: x
m
lto 0
.
0
.
1
8 does n
o
t
know --stri
n
gpa
r
am
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
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
Uncon
d
itio
n
ally set man
.
base
.
u
rl
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ham
a
no
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Hama
n
o
Docum
e
nta
t
ion/Ma
k
efile: allow man
.
ba
s
e
.
url
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
Hamano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C H
a
mano
Prep
a
re for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hamano
merge: do n
o
t add standard me
s
s
age when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
uni
o
C Haman
o
Do not
misidentify "
g
it merge foo HEAD" as an
o
ld-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
Upda
t
e
d
r
aft release notes to 1
.
6
.
6
b
efore
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
Merg
e
branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
Merge branch 'jc/deprecate-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
git-merge: a
d
epr
e
cation notice of the ancien
t
comman
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'bw
/
remote-ge
t
-ref-state
s
-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
Hamano
Mer
g
e branch
'jn/git
w
eb-bl
a
me'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
branch 'fc/main
t
-for
m
a
t
-patch-pathsp
e
c
-
d
ashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Mer
g
e branch
'
mm/
m
aint-m
e
rge-ff-er
r
or-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
M
e
r
g
e
branch 'ap/maint
-
merge-st
r
ategy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bra
n
c
h 'jc/pret
t
y-lf'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C
H
ama
n
o
Merg
e
branch
'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Me
r
ge bran
c
h 'em/commit-cla
i
m'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Haman
o
M
erge branch 'jc/mailinfo-re
m
ove-b
r
ac
k
ets'
commit
|
commitdiff
|
tree
2009-11-30
J
unio
C
Hamano
Mer
g
e br
a
n
c
h 'f
c
/
s
end-ema
i
l-enve
l
ope'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Ha
m
ano
M
erge bra
n
ch 'uk/maint-shortlog-encoding'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io
C
H
a
mano
Merg
e
b
ranch
'ns/
s
e
nd-e
m
ail-no-ch
a
i
n
-
r
eply-t
o
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
M
er
g
e
b
ran
c
h 'jc/m
a
int-am-kee
p
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Mer
g
e branch 'b
w
/diff-colo
r
-
hunk-header
'
commit
|
commitdiff
|
tree
2009-11-28
J
u
n
i
o
C Hamano
Up
d
a
t
e draft
rele
a
se notes to 1
.
6
.
6 before
m
erging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio
C
H
amano
emit_line(): don't em
i
t an e
m
pty <SET><RESET> foll
o
wed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
Hamano
Remov
e
dead co
d
e from "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
b
u
iltin-apply
.
c: pa
y
attenti
o
n to -p<n>
wh
e
n det
e
rmining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
J
u
nio C Hamano
Merge branch 'rs/
w
ork-around-grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge bran
c
h
'rj/maint-cygwin-co
u
nt-objects'
commit
|
commitdiff
|
tree
next