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
Juni
o
C Hamano
rere
r
e
: honor con
f
lict
-
marker-size at
t
ribu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rer
e
re: prepare fo
r
custo
m
izable
c
onflict ma
r
k
e
r length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
amano
con
f
li
c
t-ma
r
k
er-siz
e
: new at
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
rerere:
u
s
e
ll_merg
e
(
) instead
o
f using x
d
l_merge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io
C
Hama
n
o
merge-tree: use
l
l_merge()
n
ot xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_me
r
ge(): allow pa
s
sing d
o
wn ma
r
ker_size
in xmparam
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
a
n
o
xdl_merge(): i
n
troduce xmparam_t for
merge spec
i
f
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
git_attr
(
): fix function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
J
u
nio C
H
amano
rerere forget
p
ath:
f
orget re
c
orded resolution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Ham
a
no
rerer
e
:
refa
c
tor rerere logi
c
to ma
k
e it
indepen
d
ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
r
e
rere:
r
emo
v
e sil
l
y 1024-
b
yte line limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
reso
l
ve-undo: teach
"
update-index --
u
nres
o
l
v
e
" to
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C Hamano
r
e
solve-undo:
"checkou
t
-m path" u
s
es
r
eso
l
ve-u
n
do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Ham
a
no
reso
l
ve-undo:
a
llow pl
u
mb
i
ng t
o
c
l
ear the informati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
u
n
i
o
C
Ham
a
no
resolv
e
-undo: basic tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
resolve-undo: record
r
esolved co
n
flicts in
a
new
i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
bu
i
lti
n
-merge
.
c: use sta
n
dard
a
ctive
_
ca
c
h
e macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Ju
n
io C Ham
a
no
Git 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merg
e
branch 'maint'
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
Junio C Ham
a
no
M
e
r
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-16
Junio C H
a
mano
Git
1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Hama
n
o
Me
r
ge bra
n
c
h
'm
a
in
t
' to sync wi
t
h 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C H
a
mano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio
C
Hamano
worktree: don't segf
a
ult with an absolute pat
h
spec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Ju
n
io C H
a
mano
Update Rel
e
as
e
Notes for 1
.
6
.
6 t
o
remove old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
Hama
n
o
Sync with 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C Ham
a
no
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Fix archive
for
m
a
t
wit
h
-- on the command lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
Remove
p
os
t
-
upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Haman
o
G
i
t
1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merg
e
git
:
//repo
.
or
.
cz/gi
t
-
gu
i
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
M
erge git://gi
t
.
ke
r
ne
l
.
org
/
pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C
Hama
n
o
Up
d
ate draft release no
t
es to 1
.
6
.
6
b
ef
o
r
e
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io
C
Hamano
Merg
e
branch '
m
m/maint-merge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hama
n
o
Merge
bra
n
c
h 'jn/maint-p
u
ll-rebas
e
-e
r
ro
r
-messa
g
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
a
m
a
no
Merge branch 'j
k
/maint-add-p-dele
t
e-f
i
x' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C Hamano
Merge git:/
/
g
i
t
.
bogomips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Ha
m
ano
Revert
recent "gi
t
me
r
ge <msg>
H
EAD <
c
om
m
it>
.
.
.
" deprec
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sy
n
c
with 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Git 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
b
r
anch
'
maint
'
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ham
a
no
Prepa
r
e
for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Haman
o
Merge branch 'uk/ma
i
nt-shortlog-encod
i
ng
'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
mano
Merge bran
c
h
'
fc/maint-format-patch-path
s
pec-
d
ashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
ama
n
o
M
erge
branch
'ap/mai
n
t-m
e
rge-s
t
rategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hama
n
o
Merge branch 'jc/maint
-
am-keep'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'rs/
w
ork-around-grep-
o
pt
-
ins
a
n
it
y
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
n
o
Merge
branch
'
r
j/maint-cy
g
win-count-o
b
jects' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
e
rge branch 'mm/maint-hint
-
failed-merge' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bran
c
h 'th
/
m
a
i
n
t-remote-up
d
ate-help
-
st
r
ing' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
a
no
Merge branch 'rj/m
a
int-t
9
700' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C Haman
o
Merg
e
branc
h
'ls/m
a
i
n
t-mailinfo-no-inbody' i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erg
e
branch 'mo
/
maint-cr
l
f
-
doc
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'th/remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge
b
r
anch 'pb/maint-
u
se-custom-perl'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
no
Mer
g
e branch
'mm/config
-
pa
t
hname-tilde-expand' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hama
n
o
Merge branch 'bc/gr
e
p-i-F'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o C Hama
n
o
Merge bran
c
h 'jk/mai
n
t-bre
a
k-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'rj/ma
i
nt-s
i
mplify-cygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge
branch
'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Mer
g
e branch 'np/mai
n
t-sideban
d
-favo
r
-status'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Docum
e
ntati
o
n: xmlt
o
0
.
0
.
1
8
does not kn
o
w --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge in 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Haman
o
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Unconditionally s
e
t man
.
base
.
ur
l
.
for
.
relative
.
l
inks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch
'm
a
int'
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C Hamano
Documentation/M
a
kefile: allow man
.
bas
e
.
url
.
for
.
relati
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Git 1
.
6
.
6-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ham
a
no
Prepa
r
e 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
merg
e
:
do not add standar
d
m
e
ssage when message is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Haman
o
Do not mis
i
de
n
tify "git merge foo HEAD" as an o
l
d-st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update dr
a
f
t
r
elease notes to 1
.
6
.
6 bef
o
re
-
rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Haman
o
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
ama
n
o
Mer
g
e branch '
j
c/d
e
precate-old-syntax-from-
m
erge'
commit
|
commitdiff
|
tree
2009-12-01
Jun
i
o C Hama
n
o
git-merge
:
a de
p
r
e
c
ation n
o
tice of the an
c
ie
n
t command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
J
un
i
o C Hamano
Merg
e
branch
'bw/rem
o
t
e
-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Merg
e
branch 'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-11-30
J
unio
C
Hamano
Merge branch 'fc/ma
i
nt-form
a
t-patch-pat
h
s
pec-das
h
es'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'mm
/
maint-mer
g
e-ff-error-messag
e
-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
Ham
a
no
Merge
b
ran
c
h
'ap/maint-
m
erge-str
a
t
e
gy-list-fix
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge bran
c
h 'jc/prett
y
-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Haman
o
Merge branch '
c
c/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C Hamano
Mer
g
e
b
ranc
h
'
e
m/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
ma
n
o
M
e
rge branch 'jc/mailinf
o
-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C Haman
o
Merge b
r
a
n
ch 'fc/s
e
nd-email-envelop
e
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Hamano
M
e
rge branch
'
uk/ma
i
nt-shortlog-encod
i
ng'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C
H
amano
Mer
g
e branc
h
'ns/send-email-no-c
h
ain-rep
l
y
-
to'
commit
|
commitdiff
|
tree
2009-11-30
J
unio C Ha
m
ano
Merge branch 'jc/
m
aint-
a
m-k
e
ep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
Ham
a
no
Merg
e
branch '
b
w/di
f
f-color-hunk-hea
d
er
'
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
Update draft release no
t
es to 1
.
6
.
6 before merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
emit_line(): don
'
t em
i
t an empty <SET
>
<RESET> fol
l
owed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
R
e
m
ove dead c
o
de from "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hama
n
o
Me
r
ge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
i
o
C
Hamano
built
i
n
-
apply
.
c: pay attenti
o
n to -p<n> when dete
r
mining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Juni
o
C
Ham
a
no
Merge branch 'rs/wo
r
k-a
r
oun
d
-
g
rep-opt-insa
n
ity
'
commit
|
commitdiff
|
tree
2009-11-24
J
un
i
o C Hama
n
o
Merge
bran
c
h
'rj/maint-cy
g
w
in-count-objec
t
s'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Haman
o
Merge branch 'rs/color-escape-
h
as-zero-widt
h
'
commit
|
commitdiff
|
tree
next