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
J
u
n
i
o
C
Hamano
Merge branc
h
'ag/p
a
tch-header-
v
erify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
ama
n
o
Merge
b
r
anch 'jc/c
o
nf
l
ict-marker-si
z
e'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
H
amano
Merge branch 'ag/m
a
int-apply
-
t
oo-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
amano
Merge
b
ranch 'ap/
m
erge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
M
e
r
g
e
b
ran
c
h
'
n
d/status-part
i
al-refre
s
h'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merg
e
remote branch
'remotes
/
trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge
branch
'
jh/
n
otes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Haman
o
Merge branch
'jc/mai
n
t-re
f
resh-index-is
-
optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix "
l
og" family not
t
o be too
agressive about showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
e
rge branch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
Merge branch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Mer
g
e
b
ranch 'js/e
x
ec-
e
rror-re
p
ort'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
n
o
Merge
branch 'jc/l
s
-fil
e
s-ignored
-
p
a
th
s
pec
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
Merg
e
branch 'jc/grep-loo
k
ahead'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
a
n
o
Merge
branch 'jc/maint-
s
t
rbuf
-
a
d
d-fix-doublin
g
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
e
r
ge bra
n
c
h
'mm/c
o
n
f
l
i
ct-
a
dvi
c
e
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge bra
n
ch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
mh/
r
ebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Mer
g
e branch 'ns/rebase-auto-s
q
uash'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge branch 'mh/rebase-f
i
x
up' (earl
y
part)
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hama
n
o
M
e
rge branch 'il/pu
s
h-set-upst
r
eam'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ham
a
no
Merge branch 'jk/warn-autho
r
-c
o
mmit
t
e
r-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Mer
g
e branch 'jc/iden
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'tr/ht
t
p-push-
r
ef-status
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
n
o
M
er
g
e br
a
nch 'bk/fix-relative-gi
t
dir-
f
ile'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merg
e
bran
c
h 'sd/cd-p
-
show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Ha
m
ano
Merge bran
c
h 'jc/symbo
l
-sta
t
ic
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
da
t
e
.
c: mark file-local funct
i
o
n
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Sync w
i
th 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
G
i
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 H
a
mano
M
erge
b
r
a
nch
'
b
g
/main
t
-remot
e
-up
d
ate-
d
efa
u
lt' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sb/maint-oct
o
pus' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Ha
m
ano
Me
r
g
e
b
r
a
n
ch 'bg
/
maint
-
add-all-doc
'
into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io
C H
a
m
ano
Merge br
a
nc
h
'maint-
1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
G
i
t 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jk/main
t
-
1
.
6
.
5
-
reset-h
a
rd'
i
n
t
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merg
e
branch 'tr/maint-1
.
6
.
5-bash-prompt-s
h
ow
-
su
b
module
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'd
p
/maint
-
1
.
6
.
5
-
fast
-
import-
n
on-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jm/maint
-
1
.
6
.
5-
g
rep-NUL
-
ter
m
i
n
ate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Teach @{up
s
tream} sy
n
tax to st
r
buf_branchanme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
t1506: more test
f
o
r
@{up
s
tream} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Hamano
Fix "checkou
t
A
.
.
.
" s
y
nonym for "c
h
eckout A
.
.
.
HEA
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
st
a
tus: don'
t
require the reposi
t
ory to
be writabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C
H
amano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
M
erge br
a
nch 'maint
-
1
.
6
.
4' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
M
e
rge b
r
an
c
h 'maint-1
.
6
.
3'
i
nto m
a
in
t
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
e
r
g
e branch
'
ma
i
nt-
1
.
6
.
2' int
o
maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C Hamano
Mer
g
e co
m
mit
'
v1
.
6
.
4
.
4-8-g8de651
8
' in
t
o main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ha
m
a
n
o
Fix mis-backp
o
rt
of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C H
a
mano
Update draft releas
e
notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e
branch
'
maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
no
Update draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Me
r
ge
b
r
anch 'd
p
/maint-1
.
6
.
5-fa
s
t
-import-no
n
-
c
o
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Hamano
Merge bran
c
h 'jc
/
rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge branch 'pc/uninteresting-sub
m
odule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'n
d
/includ
e
-termios-
f
or-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge branch
'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
ch 'jm/maint-
1
.
6
.
5-grep
-
NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hama
n
o
symlin
k
s
.
c:
remove unuse
d
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
object
.
c:
remove unu
s
ed f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Doc
u
ment
th
a
t merge strategies can now take their
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Make "
s
ubtree" part more orthog
o
nal t
o
the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
mano
pul
l
: Fix parsing o
f
-X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
ni
o
C Hamano
U
pdate draft releas
e
note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Me
r
g
e
b
ranch
'
tc/test-locate-htt
p
d'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Ha
m
ano
Mer
g
e branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
Merge
branch 'j
c
/
maint-1
.
6
.
1
-checkout-
m
-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
amano
Merge branch 'tc/
c
lone-v-
p
rogress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge
branch
'
tc/smart-http-r
e
str
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
a
n
o
Merge
b
ranc
h
'
jk/run-c
o
mmand-u
s
e-shell'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge br
a
nch 'sr/gfi-
o
p
tio
n
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C Hamano
U
p
d
a
te CO
P
YI
N
G with GPLv2 w
i
th new F
S
F
a
d
d
r
e
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_su
f
ficiently_given():
r
e
fac
t
or the
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
user_i
d
ent_sufficiently_given(): r
e
facto
r
the lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
rerere: honor
c
o
n
flict-marker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C H
a
mano
rerere: prepare
f
o
r
custo
m
izable conflict marker leng
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commi
t
.
c
:
:print_summary: do
no
t
release the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
conflict-
m
arke
r
-size
:
ne
w
attribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerer
e
: use ll_merg
e
() i
n
s
t
ead of
using xd
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
n
o
m
erge-tree: us
e
ll_merge()
not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hama
n
o
xdl_merge(): allow
passi
n
g down marker_size in
x
mparam
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
d
l
_me
r
ge(
)
: in
t
roduce xm
p
aram_t fo
r
merge sp
e
cific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
git_attr(): fix
f
u
n
c
tio
n
sig
n
at
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merg
e
branch
'cc/reset-
m
ore'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
T
each dif
f
th
a
t modified submod
u
le directo
r
y 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 Hamano
g
rep --n
o
-index: allow us
e
of "git grep"
o
utside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C
Hama
n
o
grep:
prepare
to run outside of a wo
r
k
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'jc/c
h
eckout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
M
e
rge branch 'rs/ma
i
nt-archive-
m
a
t
ch-pathspe
c
'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hamano
Merge branch
'
il
/
vcs-
h
elper'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
strbuf_addbuf(): allow passi
n
g the sam
e
bu
f
to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
ni
o
C
H
amano
Merge bra
n
ch 'cc/reset-mor
e
'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
Merge branc
h
'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t7502: t
e
st commit
.
s
t
atus, --s
t
a
tus and --no
-
stat
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
gr
e
p: rip
out pe
s
simization
t
o
u
se f
i
xmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip
ou
t
sup
p
ort for exte
r
n
al grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
next