repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-mv: fix moving more than one source to a single destination
2010-01-22
Junio C H
a
mano
git-mv: fix moving more than on
e
source to a singl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
Me
r
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
J
u
nio C Hamano
merge-recursive: do not ret
u
rn NULL only to
c
ause segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
con
f
lic
t
-marker-size: add
test a
n
d docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Update
dra
f
t r
e
l
ease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge branch 'bw/cvs
i
m
port
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge branch 'jc
/
ch
e
ckout-m
e
rg
e
-base'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
H
amano
Merge
branch 'ag
/
patch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Me
r
ge branch 'jc/conflict-m
a
rker-s
i
ze'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
b
r
anch 'ag/ma
i
nt-apply-too-large
-
p'
commit
|
commitdiff
|
tree
2010-01-21
J
un
i
o
C
Hamano
Merg
e
br
a
n
c
h 'ap/m
e
rge-back
e
nd-opts'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Hamano
Mer
g
e branch 'nd/status-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
M
erge remote branch 'remotes/trast-doc/for-nex
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
man
o
Merge branch 'jh/notes' (early part
)
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Hamano
Merge br
a
n
c
h 'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
branc
h
'jc/m
a
i
n
t-refresh-index-is-op
t
ional-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'rr/core
-
t
u
tori
a
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'
j
c
/cach
e
-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merg
e
bran
c
h
'
js/exe
c
-er
r
o
r
-re
p
ort'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e b
r
anch 'jc/ls-files
-
i
gnored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
am
a
no
Merge branch 'jc/gre
p
-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'jc/ma
i
nt-str
b
u
f-a
d
d-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge bran
c
h
'
m
m/
c
o
nf
l
ict
-
advi
c
e
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
Me
r
ge branch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Mer
g
e branch
'
ns/rebas
e
-auto-sq
u
ash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge branch
'
m
h
/
rebase-fixup' (ea
r
ly part)
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'i
l
/push-set-
u
pstrea
m
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jk/
w
arn-au
t
hor-c
o
mmitter-
a
fter-
c
ommit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge b
r
a
nc
h
'jc/i
d
ent'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C
Haman
o
Merge branch 'tr/http-push
-
ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'bk/fix
-
r
e
lative-git
d
ir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge
branch 'sd/cd-p-show-toplev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Mer
g
e branch '
j
c
/sy
m
bol-st
a
tic'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
date
.
c
:
mark
fi
l
e
-
local function
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Sync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
G
it 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'bg/maint
-
remote-update-def
a
ult' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merg
e
bra
n
ch 'sb/m
a
int-octo
p
us' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
M
erge branch 'bg/
m
ai
n
t
-add-all-doc' into
m
ain
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge b
r
a
n
ch 'mai
n
t-1
.
6
.
5'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git
1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge branch 'jk/maint-1
.
6
.
5-
r
ese
t
-
h
a
rd' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge
b
ranch 'tr/maint-1
.
6
.
5-
b
ash-p
r
ompt-show-s
u
bmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merg
e
branch '
d
p/maint-1
.
6
.
5-fast-i
m
port-
n
on-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge b
r
anch
'jm/main
t
-1
.
6
.
5
-grep-NUL
-
termin
a
te
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ha
m
ano
Fix
"checko
u
t A
.
.
.
"
sy
n
onym for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
s
tatus: don't
requir
e
the repository to be
w
rita
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Mer
g
e bran
c
h
'ma
i
nt-1
.
6
.
4' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge b
r
a
n
ch 'maint-1
.
6
.
3'
into maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge bran
c
h 'maint-1
.
6
.
2' i
n
to ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
Merge com
m
it
'
v1
.
6
.
4
.
4-8-g8de6518
'
into
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Hamano
Fix
mis-bac
k
port of t700
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
amano
U
p
d
ate draft rele
a
se
n
o
tes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Ham
a
n
o
Merge br
a
nc
h
'
maint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C H
a
mano
U
p
d
a
te draft release not
e
s
to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'dp/mai
n
t-1
.
6
.
5-fast
-
import-non-
c
om
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge
branch 'jc/re
r
er
e
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
e
rge branch 'pc/uninter
e
s
ti
n
g-subm
o
dule-disapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Haman
o
Merge branch '
n
d/include-
t
ermios-fo
r
-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch '
j
s/windo
w
s'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge
branch 'jm/maint-1
.
6
.
5
-
grep-
N
UL-t
e
rm
i
nate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
symlink
s
.
c: remo
v
e unused func
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
o
b
ject
.
c:
remove unused
f
unct
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
Docu
m
ent that merge strategies can now take their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Make "subtree" p
a
rt more
o
r
thogonal to the
re
s
t of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
amano
pull: Fix pars
i
ng of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Merge
bran
c
h 'tc/tes
t
-locate-h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
erge branch 'jh/commit-s
t
a
t
u
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'j
n
/make
f
ile'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C Hamano
Merge branch 'j
c
/maint-
1
.
6
.
1-ch
e
ck
o
ut-m-cust
o
m-mer
g
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
r
ge branch 'tc/
c
lone-v-
p
rogre
s
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge b
r
an
c
h
't
c
/sm
a
rt-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ham
a
no
Mer
g
e bra
n
ch 'jk/run-comma
n
d-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge branch 'sr/g
f
i-opti
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Update COPYING with
GPLv2 with new
F
S
F addre
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
u
ser_iden
t
_suf
f
icient
l
y
_
given(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
s
er
_
ide
n
t_sufficien
t
ly_given(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
rerere: honor
confl
i
c
t
-
marker-si
z
e attribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rere
r
e
: prepare for customiz
a
b
l
e conf
l
ict marker lengt
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
com
m
i
t
.
c
::p
r
int_summary: do not release
t
he format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
conflict-marker-size:
n
ew
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rer
e
re: use ll_merge()
i
n
s
tead of using xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C
Hamano
m
e
r
ge-tree: use
l
l
_
merge() not xd
l
_
m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C H
a
m
ano
xdl_merge
(
)
:
allow pa
s
sing down marker_si
z
e in xmparam_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
xdl_m
e
rg
e
(): intr
o
duc
e
xmparam_
t
for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
git_
a
ttr():
f
ix funct
i
on signat
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
M
e
rge b
r
anch 'cc/rese
t
-mo
r
e
'
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io
C Ha
m
ano
grep --n
o
-index: allo
w
use
o
f "g
i
t grep"
o
u
t
side a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io
C
Hamano
g
rep: prepare to ru
n
outside of a wor
k
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
m
ano
M
erge branch 'jc/checkout-merge-bas
e
'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hama
n
o
M
erge br
a
nch 'rs/maint-
a
rchive-match-
p
athspec'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
M
er
g
e branch 'il/vcs-helpe
r
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_addbuf(): allow passing the sa
m
e buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Ha
m
ano
Merge branch
'
cc/re
s
et-more
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Mer
g
e branch 'nd/s
p
a
r
se'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C
Hamano
t7502: test
c
o
m
m
i
t
.
status, --st
a
tu
s
and --no-sta
t
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next