repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2010-01-20
Junio C Hamano
M
e
rge branc
h
'sb/maint-oct
o
pus' in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge branch '
b
g/main
t
-a
d
d
-a
l
l-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Haman
o
Mer
g
e
branc
h
'maint-1
.
6
.
5' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
G
it 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch 'jk/maint
-
1
.
6
.
5-res
e
t-h
a
r
d
' into
maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
M
e
rge
b
r
a
n
c
h 'tr/
m
a
int-1
.
6
.
5-ba
s
h-pro
m
p
t-show-submod
u
le
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch 'dp/main
t
-1
.
6
.
5-fast-imp
o
r
t-
n
on-c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge branc
h
'jm/maint-1
.
6
.
5-grep-
N
UL-termin
a
te' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Teach @{upstream}
syn
t
ax
t
o strb
u
f_brancha
n
m
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
t
1
50
6
: more t
e
st
f
or @{ups
t
rea
m
}
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Fix "checkout A
.
.
.
"
s
y
n
o
nym for
"checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
status: don't
r
equire the
r
epo
s
itory to
b
e writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge bra
n
c
h
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'ma
i
nt-1
.
6
.
4' in
t
o
ma
i
n
t-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merg
e
branch
'
maint
-
1
.
6
.
3'
i
nto maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C H
a
ma
n
o
Merg
e
bra
n
ch 'maint-1
.
6
.
2' i
n
to maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ha
m
a
n
o
Merge commit 'v
1
.
6
.
4
.
4-8-
g
8de6518' into m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
Hamano
Fix mis-backport of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Updat
e
draft re
l
ease
n
otes
t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Update
dra
f
t release
n
o
t
e
s
t
o 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Me
r
ge branch '
d
p/
m
a
int
-
1
.
6
.
5-fast-import
-
n
o
n-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Hamano
Me
r
ge branch 'jc/rerere
'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge
branch 'pc/uni
n
teresting-
s
ubmodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Me
r
ge branch 'nd/include-termios-for-os
o
l'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge
branch 'jm/maint-1
.
6
.
5-grep-NUL-termi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
Hamano
sy
m
li
n
ks
.
c: remove unused
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
object
.
c:
r
emo
v
e
u
nused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Ha
m
a
n
o
Docum
e
nt that merge
strategies
c
an now take t
h
eir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
H
amano
Make
"su
b
tree"
p
art m
o
r
e
orthogonal to t
h
e rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Haman
o
pull: Fi
x
parsing o
f
-X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
an
o
Update draft rele
a
se notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Ham
a
no
Merge br
a
nch
'
tc/test-locate
-
httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge br
a
nch 'jh
/
commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
Mer
g
e
b
ranch 'jn/ma
k
e
f
ile'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C Hamano
Merge branch 'jc/maint-1
.
6
.
1-check
o
ut
-
m-cus
t
om-merge'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
amano
M
e
rge br
a
nch 'tc/clone-v
-
progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hama
n
o
Merge branc
h
'tc/smar
t
-ht
t
p-restri
c
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'
jk/
r
un-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merg
e
br
a
nch 'sr/gfi-option
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Upda
t
e
COPYING with GPLv2 with new
F
S
F addre
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
ano
user_ident_su
f
fi
c
iently_g
i
v
en(): refa
c
to
r
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Hamano
use
r
_iden
t
_
s
u
ffici
e
ntly_gi
v
en(): refactor the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
H
am
a
no
rere
r
e: ho
n
or conflict-marker-size at
t
rib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
r
e
r
e
re: pr
e
pare for customizab
l
e conflict mar
k
e
r
le
n
gth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
commit
.
c
:
:p
r
int_summary: do not release the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Haman
o
con
f
lict-marker-size:
n
ew attribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
rer
e
re: use
ll_merg
e
() instead
of usi
n
g
xdl_
m
er
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
m
erge-tree:
u
se ll_merge(
)
no
t
xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
xdl_merge(): al
l
ow passing
d
own marker_
s
ize in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
d
l_merge(): introduce xmparam_t for me
r
g
e
spec
i
fic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Hamano
g
i
t_attr
(
): fix
f
unction signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge b
r
anc
h
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
a
n
o
Merge branch 'cc/re
s
et-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Teac
h
d
i
f
f that mod
i
fied su
b
m
o
dule dir
e
ctory 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 Ham
a
no
grep --no-i
n
d
e
x
: allow use of "git grep" ou
t
side a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Jun
i
o
C Ha
m
ano
grep
:
p
rep
a
r
e
t
o
ru
n
o
u
tside of a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Ha
m
ano
Merg
e
b
r
anch 'jc/ch
e
ckout-merg
e
-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge
b
ranch 'rs
/
maint-a
r
chive
-
ma
t
ch-pathsp
e
c'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge b
r
anch
'
il
/
vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
aman
o
strbuf_addbuf(): allow pass
i
ng the same bu
f
to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merge branch 'cc/reset
-
m
o
re'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C H
a
mano
Merge branch 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t
750
2
:
t
est commit
.
status,
--status and -
-
no-
s
tatus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
grep: rip out pessimizati
o
n to use fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio
C
Hamano
g
r
ep: rip o
u
t s
u
ppo
r
t f
o
r externa
l
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
M
erge bra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
strbuf
.
c:
r
em
o
v
e
unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C
H
amano
s
h
a1_fi
l
e
.
c: remove unu
s
ed
f
unction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Ha
m
ano
mail
m
ap
.
c:
r
emove u
n
used fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Ha
m
a
no
ut
f
8
.
c: mark f
i
le-local func
t
ion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
amano
submo
d
ule
.
c: ma
r
k f
i
l
e-loca
l
function stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
ni
o
C Ha
m
an
o
quo
t
e
.
c: mar
k
file-local f
u
nc
t
ion stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
amano
r
e
m
o
te-curl
.
c: mark file-local
func
t
ion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
rea
d
-cac
h
e
.
c: mark file-l
o
cal f
u
n
ctions static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hama
n
o
pa
r
s
e
-optio
n
s
.
c
:
mark file
-
l
oc
a
l
funct
i
on sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C H
a
m
a
n
o
entry
.
c: m
a
rk
file-local function
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hamano
http
.
c: mar
k
file-local functi
o
ns static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
H
a
m
ano
Merg
e
branch 'jc/m
a
int-1
.
6
.
4-grep
-
lookahe
a
d' into jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
mano
grep: optimi
z
e buil
t
-in grep by s
k
ipping lines
t
h
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
g
r
ep: -L should s
h
ow emp
t
y files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
p
r
etty
.
c:
m
ark file-loc
a
l fun
c
t
i
on
stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
uni
o
C Hama
n
o
builtin-rev-list
.
c: mark file-
l
ocal f
u
n
ction
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C
Hamano
bisect
.
c
:
mark
file-l
o
cal
function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Ju
n
i
o
C
H
amano
re
r
er
e
forget path:
forget recorded
res
o
l
u
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere: ref
a
ctor rerere logic
t
o
make i
t
i
n
dependent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
ident
.
c: treat
$EMAIL as giving use
r
.
e
mail identit
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C H
a
mano
ident
.
c
: che
c
k
ex
p
licit identity for n
a
me a
n
d email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio
C Hamano
Merge
br
a
nch 'tr/http-upd
a
tes'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merg
e
branc
h
'jk/m
a
int-1
.
6
.
5-reset-hard'
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Hamano
Merge b
r
a
nch 'jk/p
u
s
h-to-
d
elete'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
a
man
o
M
e
rge branch 'mm/conf
i
g-path'
commit
|
commitdiff
|
tree
2010-01-10
J
uni
o
C Hamano
Mer
g
e
b
r
a
nch
'
p
m
/
cvs-
e
nviron'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
Merge branch
'
tr
/
maint
-
1
.
6
.
5-bash-pro
m
pt
-
show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge br
a
n
c
h 'bg/
m
aint-re
m
ote-update-default
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ha
m
ano
M
erge bran
c
h 'mm/diag-path-i
n
-treeis
h
'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
H
a
m
ano
Mer
g
e branch
'fc/opt-quiet-gc-
r
eset'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C
Hamano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
Merge bra
n
ch 'maint-1
.
6
.
2' into
m
a
int
commit
|
commitdiff
|
tree
next