repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: exclude irrelevant options from "git pull"
2010-01-21
Junio C
Hamano
Merge b
r
anch 'ag/patch-head
e
r-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
b
ranch '
j
c/conflic
t
-mark
e
r-size'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C Hamano
Merge br
a
n
c
h
'ag/main
t
-a
p
ply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
ama
n
o
Merg
e
branch 'ap/merge-backend-op
t
s'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Hamano
Mer
g
e branch 'nd
/
status
-
partial-refres
h
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge
remote branch 'remotes/tras
t
-doc/fo
r
-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge branch '
j
h/notes' (early
part)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
am
a
no
Me
r
ge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Haman
o
Merge branch '
j
c/maint-re
f
resh-index-is-
o
p
tion
a
l-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ha
m
a
no
Fix "log" family not to be too agress
i
ve about sho
w
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'r
r
/core
-
t
ut
o
r
ial'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
erge branch 'jc/c
a
che-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Merge br
a
nch 'js
/
exec-error-rep
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
n
o
Merg
e
branch
'
jc/ls-
f
iles-ignored-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hama
n
o
Merge branch 'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'jc/ma
i
n
t-strbu
f
-add-fix-d
o
ublin
g
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
man
o
Merge b
r
anch 'mm/conflict-ad
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
e
rge branch 'da
/
difft
o
o
l
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
m
a
no
Merge branch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branc
h
'ns/rebase-aut
o
-squas
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge bran
c
h
'
mh/
r
eb
a
se-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'i
l
/p
u
sh-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
rge branch 'jk/warn
-
a
u
thor-com
m
itter-after-co
m
m
i
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hama
n
o
Merg
e
branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
Merge b
r
anch 'tr/ht
t
p
-
push-
r
ef-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
a
mano
M
e
r
ge branch 'bk/fix-relativ
e
-gi
t
di
r
-fi
l
e
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ham
a
no
Merge
b
ranc
h
'
sd/cd-
p
-s
h
ow-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge branch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io 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 Hama
n
o
S
y
nc with
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Hamano
Merge branch 'b
g
/maint-remote-up
d
a
te-
d
efault'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge br
a
nch 's
b
/maint-octopus'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merge branch 'bg/maint-add
-
all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge br
a
n
c
h '
m
aint
-
1
.
6
.
5' i
n
to m
a
i
nt
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hamano
Git
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
Hamano
Me
r
ge branch 'jk/main
t
-1
.
6
.
5-reset-hard
'
into main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
b
ranch 'tr/
m
aint-1
.
6
.
5-ba
s
h-p
r
ompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
n
o
M
erge branch 'dp/main
t
-
1
.
6
.
5-fast
-
import-non-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge bran
c
h 'j
m
/
m
aint
-
1
.
6
.
5-grep-NUL-terminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Tea
c
h @{u
p
stream} syntax
to strbu
f
_branch
a
n
me()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
t1506: more test for @{upstream} syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
Fix "checkout A
.
.
.
" sy
n
ony
m
for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Haman
o
s
t
atus: don't re
q
uire the repository
t
o be writa
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'm
a
in
t
-1
.
6
.
4
' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge bran
c
h '
m
aint-1
.
6
.
3'
i
nto m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge br
a
nch 'mai
n
t-1
.
6
.
2
'
into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge com
m
it 'v1
.
6
.
4
.
4-8-g8de651
8
' into ma
i
nt-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fi
x
mis
-
backpo
r
t of
t
7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Ha
m
ano
U
pdate dr
a
ft relea
s
e notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o
C
Hamano
Mer
g
e
branch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update draft
r
el
e
ase note
s
to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merg
e
branc
h
'dp/maint-1
.
6
.
5-fast-import-non-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge
b
r
anch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o
C
Hamano
M
e
rge
branch 'pc/uninteresting-
s
ubmodule
-
dis
a
ppear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C Ham
a
no
Merge branch 'n
d
/
i
n
clude-term
i
os-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o C Hamano
Merge
b
ranch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
Hamano
M
e
rg
e
bran
c
h
'jm/maint-1
.
6
.
5-grep-
N
UL-termin
a
te' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
m
ano
symlinks
.
c: remo
v
e
u
nus
e
d fu
n
cti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
object
.
c: remove unus
e
d
functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Document that merge strateg
i
es can now take their
o
wn
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C
Hama
n
o
Make "subtree" part more
o
rthogonal to the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix parsing of -X<op
t
ion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
i
o
C Ha
m
ano
Updat
e
draft release note
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Merge
branch 'tc/test
-
locate
-
h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'jh/commi
t
-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bra
n
ch 'jn/
m
ak
e
fi
l
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge branch 'jc
/
maint-1
.
6
.
1-checkout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
M
erge branch 'tc/clon
e
-v-prog
r
ess
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge branch 'tc/smart-htt
p
-
r
est
r
ic
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ham
a
n
o
Merg
e
bra
n
c
h
'jk/run-command-use
-
shell'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Ha
m
ano
Merge
b
ranch 'sr/gfi-
o
ptions'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Ham
a
no
Upd
a
t
e COPYING with
GP
L
v2 with new FS
F
address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
user_ident_sufficiently_gi
v
en(): refactor t
h
e
logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hamano
user_ident_sufficien
t
ly_gi
v
en(): ref
a
ctor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
r
e
rere:
h
onor conf
l
i
ct-
m
arker-size attrib
u
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hama
n
o
r
e
re
r
e: prepare for customiza
b
l
e
confl
i
ct mark
e
r lengt
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
com
m
it
.
c:
:
print_summary: d
o
not release
t
he for
m
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
confl
i
ct-marker-siz
e
: ne
w
attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
rerere: use ll_merg
e
(
) instead of using xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merg
e
-tree: use ll
_
merge(
)
not xd
l
_merg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(
)
:
allow passing down
mar
k
er_size in xmparam
_
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_
m
erge
(
): introduce xmparam_t for merge
s
p
e
ci
f
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
git_at
t
r(
)
: fix funct
i
o
n
signa
t
ur
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
ge branch 'cc/re
s
e
t
-
more'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
T
e
ach
d
iff that modified su
b
m
o
dule directory is dirty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C H
a
m
a
no
grep --no-index: all
o
w use
of
"git grep" o
u
t
side a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Haman
o
gre
p
: prepar
e
t
o
run 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
mano
Merge branc
h
'jc/che
c
kout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
e
rge b
r
a
nch 'rs/maint-archive-match-p
a
thspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
Merge branch 'il
/
vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_addbuf(
)
: allow passing
t
he same buf to dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C Ha
m
ano
Merge bra
n
ch
'
cc
/
r
e
s
et-more
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
erge b
r
anch 'nd/
s
p
a
r
se'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
t7502: tes
t
comm
i
t
.
stat
u
s, --status and --no-sta
t
us
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
gr
e
p
:
rip out pessimiz
a
tion to use fixmatch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip
out support for
ex
t
ernal grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
next