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
diff --check: honor conflict-marker-size attribute
2010-03-25
J
u
nio C
H
ama
n
o
diff --che
c
k:
h
onor conflict-mark
e
r
-
siz
e
attri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
erere
:
honor confli
c
t-marker-siz
e
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
r
erere: prepare for
c
u
stomiza
b
le con
f
lict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
conflict-m
a
rker-size:
n
ew a
t
tribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rere
r
e:
use ll_
m
erge() instead of
using xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hama
n
o
m
e
rge-tr
e
e:
use
ll_merge()
n
ot xdl_merge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
xdl_merge(): allow passing d
o
w
n
mark
e
r
_
size in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
xd
l
_
m
erge(): intr
o
d
u
ce
x
mparam_t
f
or
m
erge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
g
i
t_attr(): fi
x
function sig
n
ature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
J
unio
C Hamano
rer
e
re forge
t
p
a
th: forget recorded
resolu
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Haman
o
rerere: refactor rerere log
i
c to make it
independent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
aman
o
r
erere
:
remo
v
e silly 1024-byte line
limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
resolve-undo: teac
h
"
update-i
n
d
e
x --unresolve" to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-
u
ndo: "c
h
eckout -m path"
uses re
s
olve
-
u
ndo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-undo: allo
w
plumbing
to clear the
i
n
f
ormation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Ham
a
no
resolve-undo: basic test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Ham
a
n
o
resolve-un
d
o
:
record res
o
lved
c
onflicts in
a new
index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Hamano
b
u
iltin-merge
.
c: us
e
s
t
andard active_cache
macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Hamano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Ha
m
an
o
Merg
e
branch
'
m
a
int'
commit
|
commitdiff
|
tree
2009-12-20
Junio C Haman
o
Git 1
.
6
.
6-rc
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
i
o
C
Haman
o
Merge bra
n
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
6
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Merge b
r
anch 'maint' to sync w
i
th 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
Ham
a
no
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
amano
w
o
r
ktree: don't s
e
gf
a
ult with an absolute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o C Ha
m
ano
Update Release No
t
es
f
or
1
.
6
.
6 to
remove old bugf
i
xes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C Hamano
Sy
n
c with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
n
io C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Ham
a
no
Fix archive fo
r
mat with --
on
the comman
d
li
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io
C Hamano
Remo
v
e po
s
t-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
no
Git
1
.
6
.
6-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C
H
amano
Me
r
ge
git://
r
epo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge gi
t
:
//
g
it
.
k
e
r
nel
.
o
r
g/
p
u
b/s
c
m/git
k
/g
i
tk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Updat
e
draf
t
release
n
otes
t
o 1
.
6
.
6 bef
o
r
e -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C
Hamano
Mer
g
e bra
n
c
h
'mm/main
t
-
merge-ff
-
error
-
message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io
C Hamano
Merge bran
c
h '
j
n/maint-pull-reb
a
s
e-e
r
ro
r
-message' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merge branch 'jk/maint-add
-
p-d
e
let
e
-
f
ix' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merg
e
git://git
.
b
o
go
m
ips
.
org/git
-
svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert recent "git me
r
ge
<
msg> HEAD <
c
omm
i
t
>
.
.
.
" deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Syn
c
with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ha
m
ano
Gi
t
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
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
H
amano
Merge branch 'uk/
m
aint-sh
o
rtlog-e
n
coding' into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ham
a
no
Merg
e
branc
h
'
f
c
/maint-format-patch-pa
t
h
spec-
d
ashe
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
Hamano
M
e
r
ge branch
'
ap/mai
n
t-
m
erge-stra
t
e
g
y
-
list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erg
e
branch 'jc/maint-am-keep' into
ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Mer
g
e branc
h
'rs/work-around-grep-o
p
t
-insan
i
ty'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
a
no
M
e
rg
e
branch
'
rj/maint-cyg
w
in-count-objec
t
s' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mm/
m
aint-hint-failed-
m
e
r
ge' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
aman
o
Me
r
g
e
b
ranch '
t
h/m
a
int-remote
-
update-help
-
s
tring' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-t97
0
0
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Merge branch 'ls/maint-mailinfo-no-i
n
body'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Mer
g
e branch
'mo/maint-crlf-doc' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge bra
n
ch '
t
h/remote
-
usag
e
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merg
e
branch 'pb/maint-use-custo
m
-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'mm/con
f
ig-pathname
-
tilde-e
x
pand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hama
n
o
Merge branch
'
bc/gre
p
-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Mer
g
e
b
ranch 'jk/maint-br
e
ak-rename-reduce-mem
o
ry'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge
b
ranch 'rj/
m
aint-simplify
-
cygwin-makefile
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C H
a
man
o
Merge br
a
nch
'
rg/d
o
c-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Me
r
ge branch 'np/maint-si
d
eband-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Documentat
i
on: x
m
lto 0
.
0
.
18 does
n
o
t
kn
o
w
-
-str
i
ngparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Ha
m
ano
M
erge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Git
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Uncon
d
itiona
l
ly set man
.
base
.
url
.
fo
r
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
Documen
t
ation/Makef
i
le:
allow man
.
base
.
url
.
for
.
rel
a
t
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Git 1
.
6
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
m
ano
Me
r
ge
b
r
a
n
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Hama
n
o
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
m
e
rg
e
: do n
o
t
a
d
d
standard messag
e
when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
D
o
not misi
d
enti
f
y "git
merge 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 draft release notes to 1
.
6
.
6
before -
r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hama
n
o
M
er
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Hamano
Merge
b
r
anch 'jc/de
p
recate-old-syntax-from-merge
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
g
it-me
r
ge: a de
p
recation n
o
tice of the a
n
cient command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
amano
Merge branch 'bw/r
e
mote-get-ref-states
-
fi
x
'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
a
mano
Me
r
ge branch 'jn/git
w
eb-blame'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Hamano
Merge b
r
anch 'fc/maint-format-p
a
tch
-
pathspec-
d
as
h
e
s'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Haman
o
Merge branch 'mm/maint-merge-ff-error-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
H
amano
Merge b
r
anch
'ap/m
a
int-merge-strate
g
y-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o
C
Hamano
Merge branch 'jc/pretty-
l
f
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge b
r
a
nch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
Merg
e
b
ranch 'em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
i
o C Haman
o
Mer
g
e branch 'jc/mailinfo-remove-bra
c
k
e
ts'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C Hamano
Merge
b
ranch
'fc/sen
d
-email-envelope
'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C
H
amano
Merge branc
h
'uk/m
a
int-shortlo
g
-encoding'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
M
e
rge branch 'ns
/
send-e
m
ail-no-cha
i
n
-
reply-to'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Ham
a
no
M
e
rge b
r
anch '
j
c/maint-am-keep
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C
Ham
a
no
Merge branch '
b
w/d
i
ff-co
l
or-hunk-header'
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
Update
d
raf
t
r
elease
n
ote
s
to 1
.
6
.
6 before merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
emit_
l
ine()
:
don't emit an em
p
ty <SET>
<
RESET> foll
o
wed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
un
i
o C Ha
m
a
n
o
R
e
move
d
e
ad c
o
d
e
f
rom "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
Ha
m
ano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hama
n
o
buil
t
i
n-ap
p
ly
.
c: pay attention t
o
-p<n>
when d
e
termining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hamano
Merge
b
r
a
n
ch 'rs
/
work-around-grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
J
u
nio C Haman
o
Merge
bra
n
ch 'rj/maint-cygwin-count-obj
e
cts'
commit
|
commitdiff
|
tree
next