repo.or.cz
/
git
/
jnareb-git
/
bp-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 Hamano
d
i
f
f --check: hono
r
confl
i
ct-
m
arker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
rerer
e
: honor conflict-mark
e
r-size
a
ttribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
re
r
e
r
e
: prepare for customizable co
n
flict ma
r
ker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflict-
m
arke
r
-siz
e
: new attr
i
bute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
e
r
e
re: use ll_merg
e
() instead of using xd
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
merge-tree: use ll_mer
g
e() not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C H
a
mano
xdl_merge(): allow passin
g
down
m
a
rker_si
z
e in xmp
a
ra
m
_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge():
introd
u
ce xmparam_t for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr
(
): fix
fu
n
ction s
i
gnature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Jun
i
o C Haman
o
rer
e
re f
o
rget path: forg
e
t recorded
r
esoluti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere: refactor rerere logic to
make
it independ
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
rerer
e
:
remove silly 1024
-
byte line limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
un
i
o C Ham
a
no
resolve-undo: tea
c
h "update-index --unresolve" to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
a
mano
resolv
e
-undo
:
"checkout
-m path
"
uses resolve-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
i
o C Hamano
res
o
lve-undo: allow plumbing to clear the information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-undo: basic
t
e
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Hamano
resol
v
e-undo: re
c
ord res
o
lved confli
c
ts in a
n
ew index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
bu
i
ltin
-
merge
.
c:
use standard active_cache
m
acros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
J
u
nio C
Ha
m
ano
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Mer
g
e br
a
nch
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2009-12-20
Jun
i
o C Ha
m
ano
G
it 1
.
6
.
6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
Haman
o
Git 1
.
6
.
6-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
Me
r
ge bra
n
ch 'maint' to
syn
c
with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io
C
Hamano
Gi
t
1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
worktree: d
o
n't seg
f
a
ult wi
t
h
an
abso
l
u
t
e pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Ju
n
i
o
C
H
a
mano
Update Release
N
otes for 1
.
6
.
6
t
o
r
emov
e
o
ld bugfix
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Sync
w
ith 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Hamano
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
no
Fix archive f
o
rmat with -- on the c
o
mmand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
n
i
o C Haman
o
Remove post
-
upl
o
ad-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
Jun
i
o C Hamano
Merge git://repo
.
or
.
c
z/g
i
t
-gui
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
M
erge git://git
.
kernel
.
org/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hama
n
o
U
p
date draft release notes to 1
.
6
.
6 befor
e
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
M
erge branch 'mm/maint-m
e
rge-
f
f-
e
rror-
m
essage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
M
e
rge branc
h
'jn
/
maint-pull-
r
ebase-error-message'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Ha
m
ano
Mer
g
e branch
'jk/maint-add-p-delet
e
-
f
i
x
' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io
C
H
amano
Merg
e
git://git
.
b
o
gomip
s
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Re
v
ert recent "g
i
t m
e
rge <msg> HEAD <
c
ommit>
.
.
.
" deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ham
a
no
S
ync
w
ith 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Ham
a
n
o
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ham
a
no
Merge bran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
r
g
e
branch 'uk/ma
i
nt-sh
o
rtl
o
g
-e
n
coding
'
i
n
to
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
ano
Merge branch 'fc/maint-format-patc
h
-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C H
a
mano
Merge branch 'ap/m
a
int-me
r
ge-
s
trategy
-
list-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch 'jc/maint-am-keep
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Hamano
M
e
rge branch 'rs/work-around-gr
e
p
-op
t
-insanity'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C
Ha
m
ano
Merge branch '
r
j/mai
n
t-cy
g
win-count-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge branch 'm
m
/mai
n
t
-hint
-
fai
l
ed-merge' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Ha
m
ano
Merge branch 'th/maint-remote-update-help-
s
tring'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'rj
/
m
a
i
nt-t9700' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
Hamano
Merge
br
a
nch 'ls/maint-mail
i
nfo-n
o
-inbody'
into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Ham
a
no
Merge
b
r
anch
'mo
/
maint-crlf-doc'
into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
r
g
e branch 'th/remot
e
-us
a
ge'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
ano
Merge
branc
h
'pb/maint-u
s
e
-
custo
m
-
p
e
r
l' into
m
ain
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge br
a
nch 'mm/config-p
a
th
n
ame-ti
l
de-ex
p
and' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Merge br
a
nch 'bc/grep-i-F' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'jk/maint
-
b
r
e
a
k-rename-r
e
duc
e
-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge
b
ranch 'rj/
m
aint-
s
impl
i
f
y-cygwi
n
-makefile' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C
H
amano
Merge
b
r
a
n
c
h 'rg/doc-work
f
low' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
a
n
o
Merge branch 'np/maint-side
b
and-favor-s
t
atus' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
Documentat
i
on: xm
l
t
o
0
.
0
.
1
8
d
o
es not know --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
an
o
M
e
rge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio 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
Unconditional
l
y
s
et m
a
n
.
base
.
url
.
fo
r
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Documentation
/
M
a
ke
f
ile: allo
w
man
.
bas
e
.
u
rl
.
for
.
relat
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio 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
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Ham
a
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
H
a
mano
merge:
do not add standard message when
m
essage is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
Do not misidenti
f
y "git m
e
rge foo HEA
D
" as an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Up
d
ate draf
t
r
e
lease
n
otes to 1
.
6
.
6 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merg
e
branch
'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C Hamano
Merge branch '
j
c/deprec
a
te
-
old
-
syntax-from-merge
'
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio
C
H
am
a
no
git-m
e
rge: a deprecation
n
otice of the an
c
ient
c
o
m
m
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hamano
M
e
rge b
r
anch 'bw/remote-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Ham
a
no
Me
r
g
e branch 'jn/gitw
e
b-b
l
ame'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Me
r
ge branch 'fc
/
maint-f
o
rmat-p
a
tch-pathspec-
d
ashes
'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o C H
a
mano
Merge bra
n
ch 'm
m
/maint-m
e
r
g
e
-ff
-
error-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C
Hamano
M
e
r
ge b
r
an
c
h 'ap/ma
i
nt-merge-strat
e
gy-list
-
f
ix'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C
H
amano
Merge branch 'jc/
p
retty
-
lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
Merge
branch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Haman
o
Merge bran
c
h 'em/co
m
mit-claim
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ha
m
ano
M
e
rge branch 'jc/maili
n
f
o-
r
emove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Ham
a
no
M
erg
e
bran
c
h
'
fc/sen
d
-
ema
i
l-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Ham
a
no
Merge bra
n
ch 'uk/maint-shortlog-encod
i
ng'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge bran
c
h '
n
s/sen
d
-email-no-
c
hain-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch '
j
c/maint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'bw/diff-color-hunk-heade
r
'
commit
|
commitdiff
|
tree
2009-11-28
Junio
C
Hamano
Upd
a
te draft re
l
ease not
e
s to 1
.
6
.
6 b
e
fore
m
ergin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
emit_li
n
e():
don'
t
emit an emp
t
y <SET><RES
E
T
>
followed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
unio C Ha
m
a
n
o
R
em
o
ve d
e
ad code f
r
om "gi
t
am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C
Hamano
bu
i
lti
n
-apply
.
c: pay attention to
-p<n>
w
hen determining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Haman
o
Merge branch 'rs/
w
ork-a
r
ound-gr
e
p-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Mer
g
e bra
n
ch
'rj/main
t
-cy
g
w
in-count-object
s
'
commit
|
commitdiff
|
tree
next