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
Merge branch 'jk/grep-double-dash' into maint
2010-01-22
Junio C Ham
a
no
ignore dupli
c
a
ted
s
lashe
s
in m
a
k
e_relative_path()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
git
-
m
v:
fi
x
mov
i
ng more t
h
an one sour
c
e
t
o
a single
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
io C Ham
a
no
Merge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
merge-recursive:
do not re
t
ur
n
NULL only to cause segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix "log --onel
i
ne"
not to show notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
conflict-marker-size: add t
e
s
t
a
n
d
d
o
cs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Up
d
ate draft release notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge bra
n
ch
'
bw/c
v
simport'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hama
n
o
M
e
r
ge branch
'
jc/che
c
kout-merge
-
bas
e
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio
C
Hamano
M
erge branc
h
'ag/patch-header
-
ver
i
fy
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge branch 'jc
/
confli
c
t-mark
e
r-siz
e
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Mer
g
e branch 'ag/
m
aint-a
p
p
l
y-to
o
-la
r
ge-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C Hamano
Merge branch 'ap/
m
e
r
ge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
M
erge
b
r
anch 'nd/s
t
atus-parti
a
l-refresh'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge remote b
r
anch
'
remotes/trast-doc/for-next
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
m
a
no
Mer
g
e branch 'jh/notes' (earl
y
part)
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Merge
b
ranch 'jc/maint-refre
s
h-
i
ndex-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix "
l
o
g
" fami
l
y no
t
t
o
be too agres
s
ive
about sh
o
wing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Haman
o
M
e
r
g
e br
a
nch 'rr/core-tutorial
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge
b
ranch 'jc/cache-
u
nmerge'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
ma
n
o
Me
r
ge bra
n
ch 'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
Merge branch 'jc/
l
s
-files-ignored
-
paths
p
ec'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
m
ano
Merge branch 'jc/grep-look
a
head
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
erge
b
ranch 'jc/maint-strbuf-add-fix-d
o
ubling
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
Merge branch 'mm/co
n
fl
i
ct-advi
c
e'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
an
c
h 'da/difftool
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch 'm
h
/rebase
-
fi
x
up'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'ns/rebas
e
-
auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branc
h
'mh/rebase-fixup
'
(
early
p
art
)
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge
branch
'
i
l
/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jk/warn-auth
o
r-com
m
itter
-
a
fter-commit'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
e
rge
b
r
a
nch
'
j
c
/ident'
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C
Hamano
Merge bra
n
c
h 'tr/h
t
tp-
p
ush-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
br
a
nch 'bk/fix-relat
i
ve-
g
i
tdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge b
r
anch 'sd/c
d
-p-
s
how
-
toplevel
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
M
e
rge bran
c
h 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
date
.
c: m
a
rk file-local function
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C H
a
man
o
Sync with
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Git
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C H
a
mano
M
e
rge b
r
anch
'bg
/
m
a
int-
r
emote-update-defau
l
t' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Me
r
ge b
r
a
n
c
h
'sb/ma
i
nt-octopus
'
in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branc
h
'
bg/mai
n
t-add-all-doc' int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch '
m
ai
n
t-1
.
6
.
5' into
maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
rge branc
h
'jk
/
main
t
-1
.
6
.
5
-
r
e
s
e
t-hard' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'
t
r
/
ma
i
n
t
-1
.
6
.
5
-bash-p
r
ompt-sho
w
-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
n
o
Merge br
a
nch 'dp/ma
i
n
t
-1
.
6
.
5-fast-import-non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
e
rge bran
c
h 'jm/m
a
i
nt-1
.
6
.
5-
g
r
ep-NUL-termin
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Teach @
{
up
s
tream} sy
n
tax to strb
u
f_branchan
m
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
t1506: more
t
est f
o
r
@{upstream
}
syn
t
ax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Fix "checkout A
.
.
.
" sy
n
onym for "
c
heckout A
.
.
.
HEA
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status: don't require the rep
o
sitory
to be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
Hamano
Merge
b
ranch '
m
a
i
nt-1
.
6
.
4
'
into
m
aint
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge bran
c
h
'
m
aint-1
.
6
.
3' into
m
ai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
H
aman
o
M
erge bran
c
h 'maint-1
.
6
.
2'
i
nto maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hama
n
o
M
erge commit 'v1
.
6
.
4
.
4-
8
-g8de6518' i
n
t
o
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
H
amano
Fix mis-back
p
ort of t70
0
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C Hamano
U
pdate
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
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
H
amano
Upd
a
te draft release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
branch 'dp/mai
n
t-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge br
a
nch 'jc/
r
erere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge br
a
nch 'pc/uni
n
teresting-submodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Ham
a
no
Merge b
r
anch 'nd/include-te
r
mios-for
-
oso
l
'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
H
amano
Merge branch 'js/win
d
ows'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge branch 'jm/maint-1
.
6
.
5-grep-
N
UL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hama
n
o
s
ymlinks
.
c:
re
m
ove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C
H
am
a
no
obj
e
ct
.
c: rem
o
ve
u
nus
e
d functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
D
o
cument that merge str
a
tegies can now take their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
Mak
e
"sub
t
ree" p
a
rt more orthogonal
to th
e
rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
Hamano
p
u
l
l
:
Fix p
a
rsing of
-X<o
p
tion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
Up
d
ate draft rel
e
ase
n
o
t
es
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io
C
Hamano
M
e
rge b
r
anch 'tc
/
tes
t
-locate
-
ht
t
pd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
Merge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
b
ran
c
h 'jc/m
a
int-
1
.
6
.
1-checkout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
r
g
e branch 'tc/clone-v-pr
o
gress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Me
r
ge b
r
anch
'
tc/smart
-
ht
t
p-restrict
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ha
m
ano
Me
r
ge branch 'jk/run-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Mer
g
e branch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C Hama
n
o
Update
C
OPYING with GPLv2 with n
e
w
F
SF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ha
m
ano
user_
i
dent_sufficie
n
tly_given(): refactor
the lo
g
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
u
ser_ident_sufficiently_giv
e
n(): ref
a
ctor th
e
logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
rerere: honor
c
o
n
flict-marker-size attribu
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
e
rere:
prepa
r
e for customi
z
able
conflict
m
arker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
mano
commit
.
c::print_summary:
do not
r
el
e
ase the
f
ormat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
conflict
-
marker-si
z
e:
new attri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere
:
use ll_merge() i
n
stead of u
s
ing
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(
)
not xdl_m
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
x
d
l_mer
g
e(
)
: allow pa
s
sin
g
down
m
arke
r
_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
xdl_me
r
ge(): intr
o
duce xmparam
_
t for merge specif
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
g
it_attr(): fix
fu
n
cti
o
n signa
t
u
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
M
erge
branch 'cc/reset-more
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Te
a
ch di
f
f that
m
odif
i
ed submodule dir
e
ctory is d
i
rty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Juni
o
C
Ha
m
ano
grep --no-
i
nd
e
x: allow us
e
o
f
"
g
it
g
rep" outsid
e
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Juni
o
C Hamano
gre
p
:
prepare t
o
run outsid
e
o
f a work
t
ree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
Merge bran
c
h 'jc/che
c
kout-merge-
b
ase'
commit
|
commitdiff
|
tree
next