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
Jun
i
o C Ha
m
a
no
dif
f
--chec
k
: hon
o
r conflict-marker-size
a
t
t
r
ibu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
rerere:
h
onor con
f
l
ict-marker
-
s
i
ze attribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Hamano
r
e
rere: p
r
ep
a
r
e
fo
r
custom
i
zable conf
l
ict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflict-marker-siz
e
:
n
ew attribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ha
m
ano
rer
e
re: us
e
l
l_merge
(
) inst
e
a
d
of usin
g
xdl_
m
erge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-
t
ree: use ll_m
e
r
ge() no
t
x
d
l
_me
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge()
:
allow passing down
marker_size
in
x
m
p
aram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
xd
l
_mer
g
e(): introduce xmparam_t
for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_att
r
(): fi
x
functi
o
n s
i
gnature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
J
u
n
i
o C Hamano
rer
e
re
forget p
a
th:
f
orge
t
reco
r
ded r
e
solution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Ju
n
io C Hamano
r
e
rere: re
f
ac
t
or rer
e
r
e
logic to mak
e
it independent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
rerere: rem
o
ve sil
l
y 1024-byt
e
line limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
a
n
o
resolve-undo: te
a
ch "update-index --unresolve" to
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C
H
amano
resol
v
e-und
o
:
"
checkout -m p
a
th" us
e
s resolve-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-undo: allow plumbing to clear t
h
e in
f
ormation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
H
am
a
no
resolve-undo: b
a
s
ic t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
resolve-und
o
: record re
s
olved conflic
t
s in a new
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
bui
l
tin-mer
g
e
.
c: use stand
a
rd active_cache macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio
C Haman
o
Gi
t
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Ha
m
ano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Preve
n
t git bl
a
m
e
f
rom segfaulting on a missing author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
Hamano
Git 1
.
6
.
6-
r
c4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Ham
a
no
Merge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-20
Bj
ö
r
n Gustavsson
rebase -i: abort cle
a
nly
if
t
he ed
i
tor fail
s
to laun
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Step
h
en
B
oyd
technical-do
c
s: document hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
Boyd
api-strbuf
.
txt
:
f
i
x typos a
n
d document launc
h
_ed
i
t
o
r()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hama
n
o
Git 1
.
6
.
6-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Merge
b
r
a
nch 'maint' to s
y
nc with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
G
it 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Haman
o
wor
k
tree: don't s
e
gf
a
ult with an
a
bsolute
p
athspe
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ignore unknown
c
olor c
o
nf
i
guration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Joh
a
nnes
Sixt
h
elp
.
autocorr
e
ct:
d
o not
r
u
n
a co
m
mand
i
f
the command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako
S
hirai
s
hi
Illus
t
rate "filte
r
"
a
ttri
b
ute with an exa
m
p
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
B
jö
r
n Gustavss
o
n
bash: Support new 'git fetch' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C Ha
m
ano
U
p
dat
e
Relea
s
e
N
o
te
s
for 1
.
6
.
6
to remove old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Juni
o
C
H
ama
n
o
Sync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o
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 Hamano
Fi
x
a
rchive format with -- on th
e
comm
a
nd
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Haman
o
R
e
move p
o
st-up
l
oad-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
i
o
C Ha
m
ano
Git
1
.
6
.
6-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
H
amano
Merge git:/
/
repo
.
or
.
cz/git
-
g
u
i
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hama
n
o
Merge gi
t
://git
.
kernel
.
org/pub/
s
cm/
g
itk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
a
m
ano
Update draft
r
elease notes to
1
.
6
.
6
before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C H
a
mano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
bra
n
c
h
'mm/maint-merg
e
-ff-error-message-f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hama
n
o
Merge branch 'jn/maint-
p
ull-re
b
ase-error-messa
g
e
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
Merge b
r
anch 'jk/maint-add
-
p-delete-fix' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Me
r
ge
g
it://git
.
b
o
g
o
m
ips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Juni
o
C Hamano
Revert re
c
ent "git m
e
r
g
e
<msg> HEAD <co
m
mit>
.
.
.
"
depre
c
at
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-08
J
e
f
f
King
a
dd
-
interactiv
e
: fix deletion o
f
non-empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-06
SZE
D
E
R
Gábor
ba
s
h: upda
t
e 'gi
t
commit' c
o
m
p
letion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C H
a
mano
Sync with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C
H
amano
Git
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torv
a
ld
s
F
i
x dif
f
-B/-
-
dirs
t
at misc
o
u
nting
o
f n
e
wl
y
added contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff Ki
n
g
r
e
set: i
m
prove workt
r
ee safety va
l
v
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
T
o
d
d Zullinger
D
o
c
umentation: Avo
i
d
use
o
f xmlto
-
-st
r
ingparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
R
e
né Sch
a
rf
e
archive: clarify descripti
o
n of
path paramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff Ki
n
g
rerere: d
o
n't segf
a
ult on failure to open rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
aman
o
P
r
epa
r
e
for
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge
branch
'
u
k/
m
aint-short
l
og-
e
ncoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Merge branch 'fc/
m
aint-
f
o
rmat-p
a
tch-pathsp
e
c-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
branc
h
'ap/ma
i
nt-
m
erge-strategy
-
list
-
fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge
b
r
a
n
ch 'jc/maint-am-keep' i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
er
g
e branc
h
'rs/wo
r
k-around
-
gre
p
-
op
t
-insanity' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'rj/maint-cygwi
n
-count-object
s
' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C
Hamano
M
e
rge
b
ranch
'mm/maint-
h
int-fa
i
led-me
r
ge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch 'th
/
m
a
int-remote-u
p
date
-
help
-
s
tring' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branch
'
rj/maint
-
t970
0
' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
Merge
b
ranch 'ls/mai
n
t
-
mai
l
info-no-inb
o
dy' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C H
a
mano
Merge b
r
anch 'mo/maint-crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
Hamano
Me
r
ge
b
ranch 'th/remot
e
-usag
e
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Merge branch 'pb/main
t
-use-cu
s
tom-perl' into
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
M
e
rg
e
b
r
a
nch 'mm/conf
i
g-pathname-
t
ilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bra
n
c
h
'bc/gr
e
p-i
-
F
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bran
c
h
'
jk/maint-
b
reak-rename-reduce-me
m
ory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
e
rg
e
branch 'rj/maint-
s
implify-cy
g
wi
n
-makefile' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge bran
c
h
'rg/doc-wo
r
kfl
o
w
' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'np/maint-sideband-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jakub Nar
e
b
s
ki
g
i
tw
e
b: Describe (possible)
g
i
tweb
.
js mi
n
i
f
ication
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
D
o
cume
n
tation: xml
t
o 0
.
0
.
18 does
not k
n
o
w
--stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n Herland
Fix crasher on en
c
o
u
ntering SHA1-like non-
n
ote in notes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
don Casey
t9001: use older Getopt:
:
Long bo
o
lean prefix '-
-
no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t4
2
0
1:
use ISO8859-
1
r
a
th
e
r than
ISO-88
5
9-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
an Krüger
pull: clarify advice
for th
e
un
c
onfigu
r
e
d
error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Haman
o
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Uncondi
t
ional
l
y set ma
n
.
base
.
url
.
for
.
relat
i
v
e
.
lin
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
M
e
rge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Documentation/Make
f
ile: allow man
.
base
.
url
.
fo
r
.
re
l
ative
.
.
.
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
H
ors
t
H
.
von
B
rand
g
i
t-pu
l
l
.
sh: Fix c
a
ll to git-merge for new command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Haman
o
Prep
a
re
f
or 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
merge: d
o
n
o
t
add standard
message wh
e
n message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not misiden
t
ify "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 Hama
n
o
Upd
a
te draft release notes to 1
.
6
.
6 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Ha
m
ano
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ham
a
n
o
Merge
b
ranch
'jc/dep
r
ecate-old-syn
t
ax-from-m
e
rge'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io
C
Hamano
git-merge: a depre
c
ation
n
otice o
f
the ancient comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next