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 'bw/cvsimport'
2010-01-21
Junio
C
Hamano
Mer
g
e bra
n
ch 'bw/cvsim
p
ort'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge b
r
an
c
h 'jc/ch
e
ckout-merge-b
a
se'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
M
e
rge branch 'ag/patc
h
-
h
e
a
d
er-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ha
m
ano
M
e
r
g
e b
r
anch 'jc/conflict-marker
-
size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merg
e
branch '
a
g/m
a
int-apply
-
too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
bra
n
ch 'ap/merge-backen
d
-opts'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Hamano
Merge branch
'nd
/
s
tatus-pa
r
ti
a
l-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ha
m
a
n
o
Merg
e
r
e
mote branc
h
'r
e
motes/tr
a
st-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge branc
h
'jh/no
t
e
s' (early pa
r
t)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
amano
Merge branch
'
j
c/main
t
-refresh-index-i
s
-
optio
n
al-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge branch 'rr/c
o
r
e
-tutoria
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
Merge branch 'jc/cache
-
unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Ham
a
no
Merge branch
'
j
s
/
exec-er
r
or-report'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hama
n
o
Merg
e
branch 'jc/ls-files-i
g
n
o
red-paths
p
ec'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge bra
n
ch '
j
c/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Merge branch 'jc/
m
aint-
s
tr
b
uf-add
-
fi
x
-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch '
m
m/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'mh/rebas
e
-fixu
p
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Me
r
g
e
bra
n
ch
'ns
/
rebase-auto-squ
a
sh'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'm
h
/rebas
e
-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C
Hamano
Merge bra
n
ch 'il/push-set-up
s
t
ream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
n
o
Merge branch
'jk
/
warn
-
a
ut
h
or-co
m
mitter-after
-
co
m
mit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
erge branch
'
j
c
/id
e
nt'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Mer
g
e branch 'tr/http
-
push-ref-
s
tatus'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge b
r
anch
'bk/f
i
x
-
rela
t
iv
e
-gitdi
r
-file'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Ham
a
no
Merge branch 'sd/cd-p-sho
w
-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
ge
branch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
date
.
c: mar
k
file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Syn
c
with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Gi
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge
branc
h
'
b
g/maint-re
m
o
t
e
-upda
t
e-defau
l
t'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'sb/
m
aint-oct
o
pus'
i
nto main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge br
a
nch 'bg
/
m
aint-add-all-doc'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'main
t
-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ham
a
n
o
Merge bra
n
ch
'j
k
/maint-
1
.
6
.
5-
r
eset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
e
rge bran
c
h 'tr/maint-1
.
6
.
5
-ba
s
h-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'dp/mai
n
t-1
.
6
.
5-fast-impor
t
-non
-
co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge
br
a
nch 'jm/mai
n
t-1
.
6
.
5-grep-
N
UL-term
i
nat
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Fi
x
"checkout A
.
.
.
" synonym for "check
o
u
t
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
s
tatus: don't requ
i
r
e the r
e
posito
r
y to be writabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
bra
n
ch '
m
ain
t
-1
.
6
.
4' int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ha
m
ano
Merge branch 'main
t
-1
.
6
.
3
'
into main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ham
a
no
Merg
e
branch
'
maint-1
.
6
.
2' i
n
to maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Me
r
ge co
m
mit 'v1
.
6
.
4
.
4-8-
g
8
d
e6518'
into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-backport of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Ham
a
no
Update draft release notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge
branc
h
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update
d
raft release
n
otes
t
o
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C H
a
m
ano
Merge bra
n
c
h
'dp/
m
aint-1
.
6
.
5-fast-impo
r
t
-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'j
c
/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e
bran
c
h 'pc/unint
e
re
s
ting-submodule-
d
i
sa
p
pear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C
Ha
m
ano
Merge
b
r
anch 'n
d
/incl
u
de-termios-for-oso
l
'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C
Hamano
Merge b
r
anch 'js
/
w
indows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
m
a
no
Merge branch 'j
m
/
mai
n
t
-1
.
6
.
5-grep-NUL
-
t
erminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
syml
i
nks
.
c:
remove unused
f
uncti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Ham
a
no
object
.
c: rem
o
ve unused fu
n
c
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
a
m
ano
Document
t
hat merge strateg
i
es can now take thei
r
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Make "subtree" part mo
r
e orthogonal to the rest o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
pull: Fi
x
parsing of
-X<opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C
Hamano
Update draft re
l
ease
n
o
tes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Me
r
ge br
a
nch 't
c
/te
s
t-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C H
a
mano
Merge branch 'jh
/
commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
Hamano
Merge branch 'jn/makef
i
le'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
Me
r
ge branch '
j
c/
m
aint-1
.
6
.
1-checkout-m-cu
s
tom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge branch 't
c
/
c
lon
e
-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
no
Merge branch
'
tc/smart-ht
t
p-r
e
s
trict'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
Merge branch 'j
k
/run-command-u
s
e-shell'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge bra
n
ch 'sr/gfi-opti
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Update
COPY
I
NG with GPLv
2
with new
FSF add
r
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Ham
a
no
user
_
ident_suffic
i
ently_
g
i
v
en(): ref
a
ctor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
user_ident_
s
ufficiently_given(): refactor t
h
e logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
rerere: honor conflict-marker
-
s
i
ze a
t
tribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C H
a
ma
n
o
re
r
ere
:
prepare for customiz
a
ble conflict m
a
rker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
c
omm
i
t
.
c::print_summar
y
: do not release
the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
conflict-marker-
s
ize: new attr
i
bute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
rere
r
e: us
e
ll
_
merge() instead of using xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
me
r
ge-tree
:
use ll_merge() not x
d
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
mano
x
dl_merge(): a
l
low passing
dow
n
ma
r
ker_size in x
m
par
a
m_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
xdl
_
merge(): introduce xmpara
m
_t for
merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hama
n
o
git_attr(): fix f
u
nction sig
n
ature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
man
o
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
H
a
mano
grep -
-
no-index:
a
l
low use of
"
git grep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C
Ha
m
a
no
grep: prepare to run
ou
t
side of
a
work tre
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Ha
m
a
n
o
Merge branch '
j
c/che
c
kout-merge
-
base'
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
io C Ha
m
a
no
Merge branch 'rs/m
a
int-
a
r
c
h
ive-m
a
tch-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
e
r
g
e bra
n
c
h 'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
str
b
uf_addbu
f
(): allow passing t
h
e
same buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Ha
m
a
n
o
Merge b
r
a
nch 'cc/reset
-
more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
Merge branch 'nd
/
sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t75
0
2: te
s
t com
m
it
.
st
a
tus, --st
a
tu
s
and --no-statu
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip out pessim
i
z
ation
t
o use fixmat
c
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
grep: rip out s
u
pport
f
o
r
externa
l
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge
b
r
an
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-12
J
unio
C Ham
a
no
str
b
u
f
.
c: remove unused f
u
nctio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
sha1_fil
e
.
c
: remove unu
s
ed function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next