repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/ls-files-sparse-fix'
2010-01-23
Junio C Ham
a
n
o
Merge bra
n
ch 'nd/
l
s-file
s
-sparse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C Hamano
git-mv: fix moving
m
o
r
e
than
one
sourc
e
to a single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
J
un
i
o C Ha
m
a
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
io C Hamano
me
r
ge-re
c
u
rsive
:
do no
t
return
NULL
only to c
a
use segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
conflict-marker-
s
ize: add tes
t
an
d
d
oc
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Ham
a
no
Upda
t
e
draft
release
note
s
t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ham
a
no
M
erge b
r
a
n
c
h
'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
br
a
n
ch '
j
c
/
checkout
-
merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge
b
r
an
c
h 'ag/patch
-
h
eader-verif
y
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ha
m
ano
Merge bran
c
h
'j
c
/
conflict-ma
r
ker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
ag/main
t
-apply-too
-
large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge branch
'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ha
m
a
n
o
Merge
b
ranc
h
'nd
/
st
a
tus-part
i
al
-
refr
e
sh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge r
e
mote branch '
r
emotes/trast-doc
/
for-next'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Haman
o
Mer
g
e branch 'jh/notes' (early par
t
)
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge bra
n
c
h
'maint
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge br
a
nch 'jc/maint-refresh-index-is-optional-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Me
r
ge branch '
r
r/core-tutor
i
a
l
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C
H
amano
Merge branch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Me
r
ge bra
n
ch 'js
/
exec-erro
r
-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
Merge branch '
j
c/ls-files-ignored-pathspec
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'jc/grep
-
l
o
okahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch '
j
c/m
a
int-st
r
buf-add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Me
r
ge branch '
m
m/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e bra
n
ch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'ns/r
e
bas
e
-auto
-
squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
Merge bran
c
h 'mh/rebase-fixup' (e
a
rly part
)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge b
r
anc
h
'il/p
u
sh-set-upstream
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge branch
'jk/warn-author-
c
ommitt
e
r-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
m
ano
M
er
g
e branch '
j
c/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'tr/http-p
u
sh-re
f
-s
t
atus'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge b
r
anch 'bk/fix-rela
t
i
v
e-gi
t
dir-file
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge branch
's
d
/cd-
p
-show-tople
v
e
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
Merge
branch
'
jc/
s
ymbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
d
a
te
.
c
: mark
file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Syn
c
with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'bg/maint-remote
-
update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge b
r
anch 'sb/maint-octopus' in
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'bg/maint-ad
d
-al
l
-doc' into
maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge b
r
a
nch
'
maint-1
.
6
.
5'
i
nto
maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Hamano
Gi
t
1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
a
m
an
o
Me
r
ge branch 'jk/main
t
-1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch 'tr/maint-1
.
6
.
5-bash-prompt-show-submo
d
u
le
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge branch 'd
p
/maint-1
.
6
.
5-
f
ast-import-non-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
mano
Merge branc
h
'
j
m/m
a
int-1
.
6
.
5-grep-N
U
L-
t
e
rminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix
"
checkout A
.
.
.
" sy
n
on
y
m for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ham
a
n
o
status: don
'
t requi
r
e th
e
repository to b
e
wr
i
table
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge branch 'maint-1
.
6
.
4
'
into m
a
int-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Ha
m
a
n
o
Merge branch '
m
aint-1
.
6
.
3' into main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-1
.
6
.
2' into mai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
M
e
r
g
e comm
i
t 'v1
.
6
.
4
.
4
-8
-
g8de6518' i
n
to maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Fi
x
mis-
b
ackp
o
rt of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
Haman
o
U
pdate
d
raft releas
e
notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge bra
n
ch 'dp/maint-1
.
6
.
5-
f
as
t
-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
amano
Merge
bran
c
h 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch
'
pc
/
uninte
r
esting-sub
m
odule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch 'nd/inc
l
u
d
e-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
M
er
g
e branch
'
js/windo
w
s'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
M
erge branch 'jm/
m
aint-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
a
n
o
symlinks
.
c: remove un
u
sed functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
i
o
C Hamano
object
.
c: r
e
move u
n
used functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Docume
n
t
t
hat merge strategies can
no
w
t
a
ke their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
M
a
ke "subtree" part more
orthogon
a
l
t
o
the rest
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
pul
l
: Fi
x
pa
r
sing of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Haman
o
U
p
date draft r
e
lease notes
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge bra
n
ch 'tc
/
test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
un
i
o C Hamano
Merge branch 'jh/co
m
mi
t
-
s
tatus'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io
C
Hamano
Merge b
r
a
n
ch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Merge branc
h
'jc/maint-1
.
6
.
1-checko
u
t-m-cu
s
tom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
M
erg
e
b
r
a
nch 'tc/clone-v
-
prog
r
ess'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Hamano
M
e
r
g
e bra
n
ch 'tc/smart-http
-
restrict'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge bran
c
h '
j
k/
r
u
n
-
command-use-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
M
erge branch '
s
r/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
U
p
date COPYI
N
G with
GPLv2 with new FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
user_ident_sufficien
t
ly_give
n
():
r
efactor the
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficiently_gi
v
en():
r
efactor th
e
lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
r
erere
:
ho
n
or confl
i
ct-marker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
rer
e
re
:
p
r
epare fo
r
cus
t
omi
z
able conflict mark
e
r length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c
:
:print_summa
r
y: do not relea
s
e the fo
r
mat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
H
aman
o
conflict-ma
r
ke
r
-si
z
e: new attri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
r
e
r
ere: use ll_
m
erge
(
) instead of using xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge
-
tree: use ll_merge()
n
ot x
d
l_
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
x
dl_merge()
:
allo
w
passing down mark
e
r_si
z
e in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
x
d
l
_
merge(): introduce 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 function si
g
nature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
ano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Merge branch 'cc
/
reset-m
o
re'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
gr
e
p
--n
o
-
i
nde
x
:
a
ll
o
w u
s
e of "git gre
p
" outside 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
r
un outside of a
w
o
r
k
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
Merge branc
h
'jc/checko
u
t-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
Merge branch '
r
s/maint-archive
-
match-pa
t
hsp
e
c'
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
i
o C Hama
n
o
Merge branch 'il/vc
s
-
h
elper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
aman
o
strbuf_addbuf(): all
o
w
p
a
ssing
the sam
e
bu
f
to
d
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branc
h
'cc/reset-
m
o
r
e'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Haman
o
Merge b
r
anch 'nd/sparse'
commit
|
commitdiff
|
tree
next