repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: honor conflict-marker-size attribute
2010-01-17
J
uni
o
C
H
a
m
ano
r
erere: honor
c
o
n
flict-marker-size att
r
i
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
rerere: prepar
e
for customiz
a
ble confli
c
t marker
l
e
n
gth
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
a
mano
co
n
f
l
i
ct-marker-size: new attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ha
m
ano
rerere: use ll_merge() instead of us
i
ng xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
merge-tr
e
e: use
l
l
_mer
g
e() not
x
dl_merg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge
(
)
: allow passing
d
own ma
r
ke
r
_s
i
ze
i
n xmpa
r
a
m
_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
xdl_merge(): in
t
roduce x
m
param_t for merge
s
pe
c
ific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
H
amano
git_
a
ttr(): fix
functio
n
signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C H
a
mano
rerere
forget path: forget reco
r
ded reso
l
ut
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C
H
am
a
no
rer
e
re: ref
a
ctor rerere logic to make
i
t in
d
e
p
endent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
r
erer
e
:
remo
v
e
silly 1024-byte line limi
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
resolve-und
o
: teach
"update-ind
e
x --un
r
es
o
lve" to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
H
amano
resolve-u
n
do: "c
h
eck
o
ut
-
m
path" uses r
e
solve-undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-
u
n
d
o: allow
p
lu
m
b
ing to clear
t
he inform
a
ti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hama
n
o
r
e
solve-
u
ndo:
b
asic
t
ests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C
Ha
m
ano
r
e
solve-u
n
d
o
: record resolved co
n
flicts in a
new index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
amano
b
u
i
l
tin-me
r
ge
.
c: u
s
e standard a
c
tive
_
ca
c
h
e
macro
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Ju
n
io C Hamano
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
J
u
n
io C Hamano
Me
r
ge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-20
Junio C
Hamano
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io C Ha
m
ano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2009-12-16
Jun
i
o C Haman
o
Git 1
.
6
.
6-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
M
e
r
g
e
branch 'maint' to sync with
1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C Hama
n
o
G
it 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Hamano
work
t
ree: do
n
't seg
f
ault with an
a
bsolute pathspe
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio
C Ha
m
an
o
Up
d
ate R
e
lea
s
e Not
e
s for
1
.
6
.
6
t
o remove old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Jun
i
o C Hamano
Sync
wi
t
h 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ha
m
ano
Gi
t
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
F
i
x arch
i
ve f
o
rmat w
i
th -- on the command li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remo
v
e post-
u
p
load-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Haman
o
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://repo
.
o
r
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Haman
o
Merge git://g
i
t
.
k
e
r
n
e
l
.
org/pu
b
/scm
/
gi
t
k/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Update dra
f
t release
notes t
o
1
.
6
.
6 before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o
C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C
H
amano
Merge
branch 'mm/maint-
m
erge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge branch 'j
n
/maint-pu
l
l
-
rebase-error-mes
s
age' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
io C Hamano
Merge b
r
anch '
j
k/main
t
-a
d
d-p-delete-fix'
i
nto
maint
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
H
a
mano
Me
r
ge gi
t
:
//git
.
b
ogomips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert recent
"
g
it merge <msg>
HEAD <
c
ommit>
.
.
.
" deprecation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio
C
H
amano
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
it 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
P
r
epare
f
or 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Ham
a
no
Merge branch 'u
k
/maint-shortlog-encod
i
ng' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'fc
/
mai
n
t-format-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
H
a
m
ano
Merge
b
ranc
h
'
ap/m
a
i
n
t-mer
g
e-strategy-list
-
fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
r
a
nch 'jc/maint-am-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Mer
g
e b
r
anch
'rs/wo
r
k-ar
o
und-
g
rep-opt-insan
i
ty' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hama
n
o
Merge branch 'rj/maint-cygwin-
c
ou
n
t-objects'
into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch 'mm/m
a
int-hint-fai
l
ed-merge' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
r
g
e bran
c
h 'th/
m
aint-remote-update-help-str
i
n
g
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Merge branch 'r
j
/maint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Haman
o
Merge branch 'ls
/
maint-
m
aili
n
fo
-
n
o
-inbo
d
y'
into m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e branch 'm
o
/m
a
int-crl
f
-d
o
c' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Me
r
g
e
branch 'th/remot
e
-usage' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
M
erge bran
c
h
'pb/m
a
int-use-custom
-
perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Mer
g
e branch 'mm/config-pathname-tilde-expand
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'bc/grep-i-
F
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
nch 'jk/
m
aint-
b
reak-renam
e
-
r
ed
u
ce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge bra
n
ch
'rj/maint-simplify-cygwin-
m
akefile
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merg
e
branch
'rg/
d
oc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C
H
ama
n
o
Merge
branch 'np/
m
aint-sideband-favor-s
t
atus' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Documen
t
ation: xmlto 0
.
0
.
18 does not
know --str
i
ngpa
r
am
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C H
a
mano
Merge in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C
H
a
mano
G
i
t
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Unc
o
nditionally set man
.
base
.
url
.
f
or
.
re
l
ativ
e
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
io C
H
a
mano
Git 1
.
6
.
6
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C Hamano
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prep
a
re f
o
r 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 standard messa
g
e
when
m
essage i
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ham
a
no
D
o
n
o
t misidentify "git
merg
e
fo
o
HEAD" as an ol
d
-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Hamano
Update d
r
aft re
l
ease note
s
to 1
.
6
.
6
b
efor
e
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o
C
Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'jc/dep
r
e
cate
-
o
l
d-s
y
n
tax-from
-
merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio
C
Ha
m
ano
git-me
r
ge: a deprecation notice of t
h
e anc
i
ent command
.
.
.
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-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C H
a
mano
Me
r
ge b
r
a
nch
'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hamano
Merge branch 'fc/maint-form
a
t-pa
t
c
h
-p
a
ths
p
ec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
J
u
n
io
C H
a
mano
M
e
rge branch 'mm
/
maint-merge-
f
f-e
r
ror-me
s
sag
e
-fix'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Hamano
M
e
rge
branch 'ap/maint-merg
e
-strat
e
gy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
M
e
rge branc
h
'jc/pret
t
y-lf'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Hamano
Merg
e
branch 'cc/bisect
-
doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge branch 'em
/
commit
-
clai
m
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'jc/mailinfo-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Merge
branch 'fc/send
-
em
a
i
l
-
envel
o
pe'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
Me
r
ge
b
ran
c
h 'uk/ma
i
nt-shortlog-encod
i
ng'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Me
r
ge branch 'ns/
s
end-email-n
o
-chain-reply
-
to'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Ham
a
n
o
Merge
b
ran
c
h
'jc/ma
i
nt-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C Hama
n
o
Merge branch 'bw/diff
-
c
o
lo
r
-hunk-he
a
d
er'
commit
|
commitdiff
|
tree
2009-11-28
Junio C
H
amano
Update
d
raf
t
rel
e
a
s
e notes
t
o 1
.
6
.
6 before merg
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
emit_line(): don't
e
mit an empty <S
E
T><RESET> followe
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Jun
i
o C Hamano
Remove dea
d
code f
r
om
"git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
J
u
nio C Hama
n
o
Me
r
ge
b
r
a
n
c
h 'main
t
'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ha
m
ano
buil
t
in-apply
.
c: pay
atten
t
ion
t
o -p<n> when
d
etermining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
J
unio C Ha
m
ano
Merge branch 'rs/wor
k
-around
-
grep-opt-ins
a
n
ity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch
'
rj
/
mai
n
t-cyg
w
in-count-objects'
commit
|
commitdiff
|
tree
2009-11-24
J
unio
C
Hamano
Me
r
ge branc
h
'rs/co
l
or
-
e
s
ca
p
e-has-
z
e
ro-wid
t
h'
commit
|
commitdiff
|
tree
2009-11-24
J
unio C Hamano
Merge branch '
b
g/apply-do
c
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Ham
a
n
o
Merge branch 'm
m
/m
a
in
t
-hint-failed-merge'
commit
|
commitdiff
|
tree
next