repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: prepare for customizable conflict marker length
2010-01-17
Jun
i
o C Hamano
rerere: prepare for cus
t
o
mizable co
n
flict marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
co
n
flict-marker-s
i
ze: new attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Haman
o
rerer
e
: use l
l
_
merge
(
) instea
d
o
f usi
n
g xdl_m
e
rge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
merge
-
t
r
ee: use ll_merge()
not xd
l
_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
xdl_merge(
)
:
al
l
ow pas
s
ing down marker_
s
ize in xmparam
_
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
x
d
l_merge(): introdu
c
e xmparam
_
t for mer
g
e
s
p
ecific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
git_attr(): fix
f
u
nction signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
J
u
nio C Hamano
r
e
rere for
g
et path:
forget
r
ecord
e
d resolution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
J
unio C Hamano
rerere
:
refactor
r
erere
l
ogic to
make it independent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
r
erere: remove s
i
l
ly 1024-byte
line
limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Ham
a
no
resolve-und
o
:
teach
"update
-
i
ndex -
-
unr
e
solve" to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
resolve-undo: "checkout -m path" u
s
es resolve-undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Ham
a
no
resolve-
u
ndo: allow
plu
m
bi
n
g
t
o clear the informat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
resolve-undo:
b
as
i
c te
s
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
resolve-undo: record reso
l
ved
conflicts in a
n
ew index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
buil
t
in-merge
.
c
:
use stan
d
ard a
c
t
ive_cache m
a
cros
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Juni
o
C
Hamano
Git
1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Ju
n
io C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Juni
o
C Hamano
Git 1
.
6
.
6
-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C
H
amano
Me
r
g
e branch
'maint'
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
Junio C Hamano
Mer
g
e bra
n
ch
'
maint' to
s
ync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
amano
G
it
1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
worktree: don't
s
egfault with an
a
bsolut
e
p
ath
s
pec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Upda
t
e Releas
e
Notes for 1
.
6
.
6
to
r
e
m
o
ve old bugfixe
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
H
amano
Sync
wi
t
h 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hamano
Gi
t
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
mano
Fix arch
i
ve format with -- o
n
t
h
e
command l
i
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remo
v
e pos
t
-up
l
oad
-
hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
uni
o
C H
a
mano
Git 1
.
6
.
6
-
rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Mer
g
e
g
it://repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge git:/
/
git
.
kernel
.
or
g
/p
u
b/s
c
m/gitk
/
gitk
commit
|
commitdiff
|
tree
2009-12-09
J
unio
C
H
a
mano
U
p
d
ate dra
f
t release no
t
e
s to 1
.
6
.
6 be
f
o
re -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
M
e
r
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C
H
ama
n
o
Me
r
ge branch
'
mm/main
t
-mer
g
e-ff-error-m
e
ssage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge bran
c
h 'jn/maint-pull-rebase-err
o
r
-me
s
sage' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
ni
o
C Hamano
Merg
e
branc
h
'
j
k/main
t
-add-p-delete-fix'
into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Me
r
ge git://git
.
bogomips
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C H
a
mano
Revert r
e
cent
"
git
m
erge <msg> HEAD
<
commit>
.
.
.
" de
p
re
c
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio 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 Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C
Ha
m
ano
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
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
Jun
i
o C
Hamano
Me
r
ge branch '
u
k/maint-shortlog-encoding' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge
b
ranc
h
'fc/
m
aint-format-p
a
tch-pa
t
h
s
pec-d
a
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'ap/maint-merge-strategy-l
i
st-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'jc/maint-am-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C H
a
mano
M
e
r
ge bra
n
ch 'r
s
/work-aro
u
nd
-
grep-opt-ins
a
nity'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Merg
e
b
ranc
h
'rj/maint-cygwi
n
-count-objects' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
M
e
rge b
r
anch '
m
m/maint
-
hint-fail
e
d-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Mer
g
e branch '
t
h/maint-r
e
mote-update-help-string
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
M
e
rge branch 'r
j
/maint-t9700' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Haman
o
M
erge b
r
anch 'ls/main
t
-mailinfo
-
n
o-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge branch 'mo/maint-crlf-doc' int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Ha
m
ano
Me
r
ge branc
h
'th/
r
e
m
o
te-usage'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Mer
g
e branc
h
'pb/m
a
i
nt-use-c
u
stom-pe
r
l' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch
'
mm
/
config-pathnam
e
-
tilde-expan
d
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
M
e
r
g
e branch 'bc/grep
-
i
-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
M
erge branch 'jk/maint-break
-
rename-red
u
ce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge b
r
anch
'rj/m
a
i
nt
-
si
m
plify
-
c
ygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Mer
g
e
b
ra
n
c
h 'rg
/
doc-workflow' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Hamano
Merge branch 'np/m
a
i
n
t
-
sideband-favor-statu
s
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Docume
n
tation: x
m
lto 0
.
0
.
18 does not know --stringparam
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
Ju
n
i
o C
Hamano
G
i
t 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ham
a
no
Uncond
i
ti
o
nally set man
.
base
.
ur
l
.
for
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
io C Ham
a
no
Git 1
.
6
.
6-r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio
C
Hamano
Prep
a
re
f
o
r
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merge: do
n
ot ad
d
standard message when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not misidentify
"
g
it merg
e
foo
H
E
AD" as an old-styl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update dra
f
t release notes to
1
.
6
.
6 bef
o
r
e
-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o
C
H
amano
Merge branch
'm
a
i
n
t'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge
b
ran
c
h '
j
c/dep
r
ecate-old
-
sy
n
t
a
x
-
from
-
merge'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Ha
m
a
no
git
-
merge: a
d
e
pre
c
at
i
on notice of th
e
anc
i
e
n
t command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
M
e
rge branch 'bw/remote-get-r
e
f-st
a
t
e
s-f
i
x'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Me
r
ge
branch 'jn/gi
t
web-bla
m
e'
commit
|
commitdiff
|
tree
2009-11-30
J
unio
C Hama
n
o
M
e
rge b
r
a
n
c
h 'fc/m
a
in
t
-
f
o
rm
a
t-patch-pathspec-dash
e
s
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
n
o
Merge branch 'mm/
m
aint-merge-
f
f-erro
r
-
messa
g
e-fix
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bran
c
h
'
ap/maint-merge-strategy-list-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'jc/pr
e
tty-l
f
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
n
o
Merge branch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
Me
r
ge branch 'em/c
o
mmit-
c
la
i
m'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'j
c
/mailinfo-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merg
e
branch 'fc/send-email-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Me
r
ge
b
r
a
nch
'uk/maint
-
shor
t
l
o
g-encod
i
ng'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C Hamano
M
erge branch
'
n
s/s
e
n
d-
e
ma
i
l
-no-ch
a
i
n
-
reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
m
a
n
o
Merge branch 'jc/maint-
a
m
-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C H
a
ma
n
o
Merge
b
r
anch 'bw/diff-co
l
o
r-hunk-header'
commit
|
commitdiff
|
tree
2009-11-28
Ju
n
io C H
a
man
o
Upd
a
t
e
draft release notes to 1
.
6
.
6
before merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio
C
Haman
o
emit
_
l
ine()
:
don'
t
emi
t
an em
p
ty <
S
ET><RESET> f
o
llowed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ha
m
ano
R
emove
dead cod
e
fro
m
"
git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C Haman
o
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ha
m
ano
b
uiltin-appl
y
.
c:
pay attention to -p<n> when det
e
rmining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hamano
Merge bran
c
h
'
rs/w
o
rk-ar
o
und-
g
rep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hama
n
o
Merge branch 'rj/main
t
-cygw
i
n-count-obj
e
c
ts'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
M
e
rge branch 'r
s
/color
-
escape
-
has
-
z
ero-wid
t
h'
commit
|
commitdiff
|
tree
2009-11-24
Junio
C Ham
a
no
Merge branch 'bg/apply-do
c
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch
'mm/maint-hint-failed-m
e
rge
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ha
m
a
no
Merge
branch 'j
c
/
l
o
g
-
stdi
n
'
commit
|
commitdiff
|
tree
next