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
Junio C Ham
a
no
diff --check:
honor confl
i
ct
-
m
arker-size attri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Ha
m
a
n
o
rerere
:
honor conflict-ma
r
ker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
rer
e
re:
p
re
p
are fo
r
customizable conflict
ma
r
ker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
con
f
lict-
m
ar
k
er-size: new att
r
ibute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: use ll_m
e
rge() instead of using xdl_merge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ha
m
ano
merge-tre
e
:
use ll_merge() not xdl_
m
erge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
xdl_merge(): allow pass
i
ng down marker_siz
e
in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): introduce
xmparam_t f
o
r merge spec
i
fic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
git_attr(): fix function si
g
nature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C H
a
mano
rerere forget p
a
t
h: for
g
et reco
r
ded resolution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
J
u
nio C
H
amano
r
e
r
e
r
e: refac
t
or rerere logic to
make it i
n
dependent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hama
n
o
rerere: remove silly 1024-byte line l
i
m
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Ha
m
a
no
resolve-un
d
o: teac
h
"update-index --un
r
es
o
lve" to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
r
e
solve-undo: "checkout -m path" uses resolve-undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-undo
:
all
o
w p
l
umbing to cl
e
ar th
e
info
r
mation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
n
o
r
e
solve-undo
:
basic t
e
sts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
u
n
io
C
H
amano
resolve-u
n
d
o:
r
e
c
ord resolved
c
onflicts in a ne
w
i
n
dex
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C
Hamano
buil
t
in-merge
.
c: u
s
e sta
n
dard active_
c
ache 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
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Prevent gi
t
bl
a
me f
r
om
segfault
i
ng on a missing
author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
J
u
nio C Ha
m
ano
Gi
t
1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Ham
a
n
o
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2009-12-20
Björn Gus
t
avsson
re
b
ase -i: abort
c
l
eanly if
the edito
r
fails to
l
aunc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen B
o
yd
technical
-
do
c
s: d
o
c
ument has
h
API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
api-strbuf
.
t
x
t: fix typ
o
s
a
nd document launch_editor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hama
n
o
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
Merge bra
n
ch 'maint'
to sync
w
ith
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Ha
m
a
n
o
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
worktree: don't segfault with an absolute path
s
pec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
eff King
ignor
e
un
k
nown color configur
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johannes
Sixt
help
.
a
u
t
ocorrect:
do no
t
run a
c
o
m
m
and if t
h
e
comm
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nana
k
o Shirais
h
i
Illustrate "filter"
a
ttribut
e
w
i
th an e
x
a
m
p
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
B
jö
r
n Gustavsson
b
a
s
h: Support new
'
g
it fetch' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Re
l
ease Not
e
s for 1
.
6
.
6 to remove old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Haman
o
Sync
w
ith 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o
C
Hama
n
o
Fix a
r
chi
v
e
f
ormat with -- on the co
m
mand line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
R
e
move post-upload-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Merge
git://re
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git
.
ke
r
n
e
l
.
org
/
pu
b
/
scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Update draf
t
release notes to
1
.
6
.
6 before -
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C
H
amano
M
e
r
ge branch
'
mm/maint-merge-ff-erro
r
-
m
e
ssage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C H
a
mano
Merge branch 'j
n
/mai
n
t-p
u
ll
-
rebase-err
o
r-mess
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merg
e
b
r
anch 'jk/maint-add-p-delete-fix' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C
Hamano
M
e
r
g
e
git:
/
/git
.
bog
o
mips
.
o
r
g/
g
it-s
v
n
commit
|
commitdiff
|
tree
2009-12-08
Junio C Ha
m
a
n
o
Rev
e
rt recent "git merge <
m
sg> HE
A
D <commit>
.
.
.
" d
e
precation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jeff
King
a
d
d-inter
a
ctive: fix deletion
of non-empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZEDER Gábor
b
a
sh: update '
g
it commit' completio
n
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
G
i
t 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
L
i
n
us Torvalds
Fix diff -B/--dirs
t
at miscounting
of newly
a
dded con
t
ent
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: improv
e
w
o
rktree
safety valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Documentation: Avoid use of xmlto --
s
tringpara
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Sch
a
rfe
archiv
e
: clarify desc
r
iption
of path paramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff Ki
n
g
r
er
e
re: don'
t
segfa
u
lt on failure to ope
n
r
r
-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hama
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Haman
o
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 Haman
o
Merge branch 'uk/mai
n
t-shortl
o
g-
e
ncoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'fc/maint
-
format-pat
c
h-pathspec-d
a
s
h
e
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Me
r
ge branch
'ap
/
mai
n
t-merge-strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch '
j
c/maint-am-keep' into m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
Merge bran
c
h 'rs/work-ar
o
und-grep-opt-insanity' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e bran
c
h 'r
j
/
maint-cyg
w
in-count-obj
e
cts'
i
nt
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C
Ha
m
ano
M
e
r
ge
br
a
nc
h
'mm/main
t
-hint-fa
i
l
e
d-merge'
into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
ma
n
o
Merge b
r
anch 'th/maint-remo
t
e-update-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Ham
a
no
Merge bran
c
h
'rj
/
maint-
t
970
0
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge br
a
nch 'ls/maint-mailinfo-no
-
i
nbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Me
r
g
e
b
r
an
c
h 'mo/maint-crlf-doc' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o C H
a
ma
n
o
M
erge branch
'
t
h/remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Haman
o
M
erge
branch
'
pb/maint
-
use
-
custom-
p
erl'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hamano
Merge branc
h
'
m
m/conf
i
g-pathname-tilde
-
expand
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
M
erge bran
c
h 'bc/grep-i-F
'
int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Me
r
g
e branc
h
'jk/maint-b
r
eak-rename
-
reduce-mem
o
r
y'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge b
r
anch 'rj/mai
n
t-simplify
-
cygwin-ma
k
efile'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Me
r
ge branch '
r
g/doc
-
workflow' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e b
r
anch 'np/mai
n
t-sid
e
band-
f
avor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jaku
b
N
a
r
e
bski
gi
t
web
:
D
e
scri
b
e (
p
os
s
ibl
e
) gitweb
.
js minification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C Hamano
Documentation:
x
m
l
to 0
.
0
.
18
d
oes
n
ot know --s
t
ring
p
aram
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
ohan Herland
Fix c
r
ash
e
r on encounteri
n
g SHA1-like no
n
-note i
n
not
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brand
o
n Case
y
t90
0
1
: use older Getopt::Long boo
l
ean prefi
x
'--
n
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Bran
d
on Casey
t4201
:
use ISO8859-1
r
ather than ISO
-
8
8
59-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ja
n
Krüger
pu
l
l: clarify advice fo
r
t
h
e unconfigured error case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
Merge
i
n 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
ano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
U
n
cond
i
tionally set
man
.
b
a
se
.
url
.
for
.
r
elative
.
l
i
nks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
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
Ho
r
st H
.
von Brand
git-pull
.
sh: F
i
x call to git-merge fo
r
new command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Hamano
Me
r
g
e
bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Prepare for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
mer
g
e: do not add standar
d
m
e
s
s
age when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C
Ham
a
n
o
Do not mi
s
identify "gi
t
merge foo HEAD" as an
o
ld-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o
C
H
amano
Update
d
raft release n
o
tes
t
o
1
.
6
.
6 bef
o
re -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Me
r
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge bra
n
ch
'jc/d
e
preca
t
e-old-synt
a
x-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
git-merge: a deprecat
i
on not
i
ce of the ancient command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
Merge br
a
nch 'b
w
/remote-get-ref-states-fi
x
'
commit
|
commitdiff
|
tree
2009-12-01
Bert
Wesarg
g
e
t_r
e
f
_st
a
t
e
s:
st
r
dup
e
ntries and free util
in stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next