repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-fetch --all/--multi: propagate options correctly
2010-01-21
Junio C Hamano
Merg
e
branch 'jc
/
che
c
kout-mer
g
e-
b
ase'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Haman
o
Merg
e
branch 'a
g
/
p
atch-header
-
v
e
rify
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
branc
h
'jc/conflict-mar
k
er-s
i
ze'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge branc
h
'ag/maint-a
p
ply
-
too-lar
g
e-p'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ha
m
ano
Merge b
r
anch 'ap/merge
-
b
ackend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge b
r
anch 'n
d
/
status-part
i
al-refres
h
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Hamano
Merge remote branch
'remotes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge bra
n
ch 'jh/notes'
(
e
a
rly
p
art)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio
C
Hamano
M
erge bra
n
c
h '
j
c/maint-refresh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
F
i
x "log" famil
y
not to be too agressive about showing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'rr/core-tutoria
l
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'jc/cache-u
n
merge'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge bra
n
ch 'j
s
/exe
c
-error-
r
e
p
o
r
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
ano
M
e
rge branch
'jc/ls-fi
l
e
s
-
i
gnor
e
d
-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
er
g
e branch '
j
c/grep-lookahea
d
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
e
rge branc
h
'
j
c/maint
-
strbuf-add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge bra
n
ch
'
mm/
c
o
nfl
i
ct-
a
dv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
n
o
M
erge
b
ranch
'
da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
M
e
rge
b
ranc
h
'
m
h/rebas
e
-fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merg
e
br
a
nch 'ns/rebase-auto-sq
u
ash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge
branch
'mh/rebas
e
-fixup'
(
earl
y
part
)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Me
r
ge branch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Mer
g
e branch 'jk/warn-author-comm
i
tter-aft
e
r
-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Me
r
ge branch 'jc
/
id
e
n
t'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge br
a
nch 'tr/http-pus
h
-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Merge
branch '
b
k/fix-relative-gitd
i
r-f
i
le'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Me
r
ge branch 'sd/cd-p-sh
o
w-topl
e
vel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge b
r
anch '
j
c/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
date
.
c: m
a
rk
f
ile-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
ano
S
y
n
c
w
ith 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
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/mai
n
t-remote
-
update-default'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
erge branch 'sb/maint-
o
ctopus' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
Merge branch
'
bg/mai
n
t-add-all-
d
oc
'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
rg
e
branch
'
maint-1
.
6
.
5' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C H
a
mano
Gi
t
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'jk/maint-1
.
6
.
5
-re
s
et-
h
a
rd
'
into
mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Mer
g
e b
r
anch 'tr/maint-1
.
6
.
5-bash-prom
p
t-show-sub
m
o
d
u
l
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branc
h
'dp/m
a
int
-
1
.
6
.
5-fast-import-no
n
-c
o
m
m
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merg
e
branch 'jm/maint-1
.
6
.
5
-
gre
p
-NU
L
-
t
ermin
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ham
a
no
Teach @
{
up
s
tre
a
m
}
syntax to
strb
u
f_branchanme()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
t1506: more
test
f
or @{up
s
tr
e
am
}
syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Hamano
Fix "ch
e
ckout A
.
.
.
" synony
m
f
o
r "ch
e
ckout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
status: don't re
q
uire the
r
epository to be writable
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
J
u
nio C H
a
m
ano
Merge bran
c
h 'maint-1
.
6
.
4
' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Me
r
ge br
a
nch 'maint-1
.
6
.
3' into
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
H
amano
Merge branch
'
maint-1
.
6
.
2' into
maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Mer
g
e commi
t
'v1
.
6
.
4
.
4-
8
-g8de6518' in
t
o
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-ba
c
kport
of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hama
n
o
Update dr
a
ft release not
e
s
t
o
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Up
d
ate d
r
aft
releas
e
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 bra
n
ch 'dp/mai
n
t-1
.
6
.
5-fast-imp
o
rt-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge
branch '
j
c/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C H
a
mano
M
e
rge branch 'pc
/
u
ninteresting-submodule
-
disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge bran
c
h 'n
d
/incl
u
de-t
e
rmios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'j
s
/window
s
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Mer
g
e branch 'jm/maint-1
.
6
.
5-grep-NUL-terminate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c: r
e
m
ov
e
unu
s
ed function
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Haman
o
object
.
c: rem
o
ve un
u
sed
f
u
n
ctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Ha
m
an
o
Docume
n
t
t
h
at merge strategies
can now ta
k
e
th
e
ir own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
ama
n
o
Make "subtree" part more
o
rthogon
a
l
t
o the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
pull: Fix parsing of -X<op
t
ion>
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
Junio C Haman
o
Merg
e
branch 'tc/test-locate
-
htt
p
d'
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
Me
r
ge
b
ranch 'jh
/
c
o
mmit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merg
e
bra
n
ch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
man
o
Merge branch 'jc/m
a
i
n
t-1
.
6
.
1
-
checko
u
t
-
m-custom-merge
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merg
e
branch 'tc/clo
n
e-v-
p
rogress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/sma
r
t-ht
t
p-re
s
trict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Merge branch
'jk/run
-
command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Haman
o
Merge b
r
an
c
h 'sr/g
f
i-opti
o
n
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Updat
e
COPYING w
i
t
h
GPLv2 with
ne
w
FS
F
addre
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
user_i
d
en
t
_suffi
c
i
e
ntly_g
i
ven(): refactor the l
o
g
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
user_ident_su
f
ficiently_given():
r
ef
a
ctor the logi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
rer
e
re
:
ho
n
or
c
onflict-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere:
prepar
e
for customizable conflict
marker l
e
ngth
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
no
commit
.
c::print_summary
:
do n
o
t release the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
no
con
f
l
i
ct-mark
e
r
-
size: new at
t
ribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
a
n
o
rerer
e
: u
s
e ll_merge() instea
d
o
f using xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tree:
u
se
l
l_mer
g
e() not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
xdl_merge(): allow p
a
ssing down
m
arker_size in
x
m
param_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
xdl_merge(): i
n
troduce xmpar
a
m_t for merg
e
specifi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
git_a
t
t
r(
)
: f
i
x function signa
t
ure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge
branch 'cc
/
reset-
m
ore'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
Hamano
Teach d
i
ff that modi
f
ied
subm
o
dule
d
irectory 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 Hama
n
o
grep -
-
no-index: al
l
ow
u
se
of "gi
t
grep" o
u
tside a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hama
n
o
gr
e
p:
p
r
e
pare to
r
un outs
i
de of a work tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C
Hamano
Mer
g
e
b
ranch
'jc/checkout-merg
e
-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
Merg
e
branch 'rs/ma
i
nt-arc
h
ive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge br
a
n
ch 'il
/
vcs-helper
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
s
t
rbuf_addbuf(): allow passing the same buf to ds
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
Merge branch 'cc
/
reset-more'
commit
|
commitdiff
|
tree
2010-01-13
J
un
i
o
C
H
amano
Merge branch 'nd/sparse
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t7502: test commit
.
status, --status and --no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
gre
p
: rip
out pe
s
s
imization to use fix
m
atch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
ama
n
o
grep: rip
o
ut
s
upp
o
rt fo
r
externa
l
gre
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next