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
Jun
i
o C Ha
m
a
n
o
d
i
ff --check: honor conf
l
i
c
t-marker-siz
e
attrib
u
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
rere
r
e: honor conflict-marker-
s
i
z
e attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepa
r
e for custo
m
i
zable c
o
nflict 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: new attri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
rer
e
re: us
e
ll_merge() instead of using x
d
l_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
mer
g
e-tree: use ll_
m
erge()
n
ot xdl_m
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
xdl_me
r
g
e
(): allow passing dow
n
marker_size
i
n xmp
a
ram_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merg
e
():
i
n
t
r
odu
c
e xm
p
a
r
am_t for merge s
p
ecific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr
(
): fi
x
function signatur
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Ju
n
io C Haman
o
rere
r
e forget path: forget rec
o
rded resolution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C
H
amano
rere
r
e: re
f
a
c
tor rerere l
o
gic to make it indep
e
ndent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hama
n
o
r
e
rere:
remove silly
1
02
4
-byte line
li
m
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Hama
n
o
resolve-undo: teach "
u
pd
a
te-index -
-
unresolve" to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
resolve-undo: "checkout -m path" use
s
resolve-undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
e
solve-undo: all
o
w plumbing to clear the in
f
o
rm
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
res
o
lve-undo
:
b
a
sic
t
e
sts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
resolve-undo: record resolved conflicts in a n
e
w
index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
J
u
n
io
C Hamano
builtin-merge
.
c: use sta
n
dard active_cache
m
a
c
ro
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
J
unio C Ha
m
a
no
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C Ham
a
no
Git
1
.
6
.
6-
r
c4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
J
unio
C
Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2009-12-16
J
u
n
i
o
C
Ha
m
ano
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'
t
o
sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
w
o
rktree:
d
on't
s
e
g
f
a
ult with an a
b
solute pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
unio C Ha
m
ano
Updat
e
Release
N
otes for 1
.
6
.
6 to rem
o
ve old
bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C Ham
a
no
Sync with 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Juni
o
C Haman
o
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C H
a
mano
Fix a
r
ch
i
ve for
m
at wi
t
h -- on the
c
omm
a
nd line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
man
o
Remo
v
e post-upl
o
a
d-
h
ook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio 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
M
erge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge
gi
t
://git
.
kernel
.
org/pub/scm/
g
i
t
k/g
i
t
k
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o
C
H
amano
U
pdate dra
f
t release no
t
es to
1
.
6
.
6
b
efore -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Ha
m
ano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge bra
n
ch 'mm/
m
aint-merge-ff-error-
m
essage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o
C Hamano
Merge b
r
a
n
c
h 'jn/ma
i
nt-pull-re
b
ase
-
e
r
ror
-
message'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
M
e
rge
branch 'jk/maint-add
-
p
-
delete-f
i
x'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge
g
it://git
.
bogomi
p
s
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2009-12-08
J
u
nio
C
Hamano
Revert recent "git merge <m
s
g> HEAD
<
co
m
mit
>
.
.
.
"
deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C
Ha
m
an
o
Sy
n
c wi
t
h 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
G
it 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio 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
H
a
mano
Merge bran
c
h
'uk/maint-shortlog-encoding' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
am
a
n
o
Mer
g
e branch 'fc/maint-format-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Haman
o
Merge
b
ranch 'ap/maint-merge-strategy-l
i
s
t
-
fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'jc/mai
n
t-
a
m-keep' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'r
s
/work-a
r
o
un
d
-g
r
ep-opt-in
s
anity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'r
j
/m
a
int-cygwin-co
u
nt-
o
bjects' int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Ha
m
ano
M
erg
e
branch 'mm/maint-
h
i
nt
-
f
ailed-merge' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bran
c
h 'th
/
m
ai
n
t-remote-up
d
a
te-help-s
t
ring' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
M
erge branch '
r
j/maint-
t
9700'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
a
m
a
no
Merge
branch 'ls
/
m
aint-mailinfo-no-inbody
'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hama
n
o
M
erge branch 'mo/main
t
-cr
l
f
-
doc' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'th/remote-usage' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge
branch 'pb/maint-u
s
e-custom
-
pe
r
l' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mm/conf
i
g-pa
t
hname
-
t
i
l
d
e-
e
xpand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'bc/grep-i-F' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
ch 'jk/maint-break-rename
-
reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/m
a
i
n
t-sim
p
lif
y
-
c
ygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'rg/doc-workflow' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
erge bran
c
h
'
n
p/maint-sid
e
band-favor-s
t
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ha
m
ano
Documen
t
ation:
x
mlt
o
0
.
0
.
18 does not know --s
t
r
ing
p
aram
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
i
n
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
ano
G
it 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Uncon
d
itionally set m
a
n
.
base
.
u
r
l
.
for
.
relative
.
links
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
J
u
n
io C Hamano
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
Prep
a
re
f
or 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
unio C Ha
m
a
no
mer
g
e: do no
t
a
dd stan
d
ard mess
a
ge when message is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Haman
o
Do not misident
i
fy "git merge
f
oo HEA
D
" a
s
an old-s
t
yle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
H
am
a
n
o
Update draft release note
s
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 branch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Haman
o
Merge branch 'jc/d
e
p
r
e
cate-old-syn
t
ax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Hamano
git-merge: a de
p
recation notice of the ancient c
o
mmand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch '
b
w/
r
emote-get-r
e
f-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge bra
n
ch
'
jn/gitw
e
b-blame'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merg
e
br
a
n
c
h 'fc/ma
i
nt
-
f
o
rmat-patch-path
s
p
ec-das
h
e
s
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge
branch 'mm/maint-merge
-
ff-error-message-f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Merge b
r
anch 'ap/maint
-
merge-s
t
rategy
-
l
i
st-f
i
x'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'jc
/
p
retty-lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
ni
o
C
H
am
a
no
Me
r
ge
b
r
anch
'cc/bisec
t
-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge b
r
anch 'em/commit-clai
m
'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Mer
g
e branch 'jc/maili
n
fo-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Hamano
M
erge branch 'fc
/
send-ema
i
l-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C
Hamano
Merge branch 'uk/mai
n
t-shortlog-encoding'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'ns
/
send
-
em
a
il-no-ch
a
i
n-reply-to
'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C H
a
mano
Merge bran
c
h 'jc/maint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
J
u
ni
o
C
Ham
a
n
o
Merge bran
c
h 'bw/diff
-
color-
h
u
nk-he
a
der'
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
Update draft release
n
otes to 1
.
6
.
6 before merging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio C
H
amano
e
m
i
t
_
line(
)
: don't emit an emp
t
y <SE
T
><
R
ESET
>
followed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Rem
o
ve dead c
o
d
e from "git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Ha
m
ano
Mer
g
e
b
ranch
'
main
t
'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
builtin-a
p
ply
.
c: pay attent
i
o
n to -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
nch 'rs
/
w
ork-around-grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Haman
o
Merge
b
ranch 'rj
/
maint-cygw
i
n-count-objects'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ham
a
no
M
erge br
a
nc
h
'rs
/
col
o
r-e
s
cape
-
h
a
s-z
e
ro-
w
idth'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
M
e
rge b
r
anc
h
'bg
/
a
p
ply-doc'
commit
|
commitdiff
|
tree
next