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
Ju
n
io 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
Me
r
ge branc
h
'j
k
/maint-1
.
6
.
5-reset-hard' i
n
to ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge b
r
anch 'tr/maint-1
.
6
.
5-bash-prompt-show-
s
ubmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
e
rge bran
c
h 'dp/maint
-
1
.
6
.
5
-fas
t
-
i
mpor
t
-
non-c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
e
rge b
r
anch 'j
m
/maint-1
.
6
.
5-grep-N
U
L-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Haman
o
Teach @{
u
pstream} syntax to st
r
buf_branc
h
anme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
t1506: more test for @{ups
t
r
eam} syn
t
a
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Fix "c
h
ec
k
out A
.
.
.
"
s
y
non
y
m for
"checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
status: don'
t
re
q
ui
r
e the
re
p
osito
r
y to be writa
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
am
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o
C
H
amano
Me
r
ge branch 'maint-1
.
6
.
4' into m
a
int-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
e
rge
branc
h
'maint-1
.
6
.
3' into maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge br
a
nch 'maint-1
.
6
.
2' into
m
aint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Ham
a
n
o
M
erge com
m
it 'v1
.
6
.
4
.
4
-8-g8
d
e6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Fix mis-ba
c
k
p
ort of
t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Update draft release n
o
te
s
to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Hamano
Updat
e
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
M
e
rge bra
n
ch 'dp/ma
i
nt-1
.
6
.
5-fast-import-non-c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hama
n
o
Merge branch 'jc/r
e
rere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
g
e branch 'pc/un
i
nteres
t
ing-su
b
module
-
disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
aman
o
Merge branch '
n
d/inc
l
ude-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merg
e
branch 'js/window
s
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
m
a
no
Me
r
ge branch 'jm/main
t
-1
.
6
.
5-grep-
N
UL-termi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
symlinks
.
c
:
remove unus
e
d function
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
ob
j
ec
t
.
c: remove un
u
s
e
d functi
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Doc
u
me
n
t that m
e
rge st
r
at
e
g
ies can
n
ow tak
e
th
e
i
r
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
Mak
e
"
subtree" p
a
rt more ort
h
og
o
nal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Ha
m
a
n
o
pu
l
l: Fix par
s
ing of -X<option
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
a
n
o
Update draf
t
release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Merge
b
ranch 'tc/test-
l
ocate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'jh/co
m
m
it-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Merge branch 'jn/ma
k
efile'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge b
r
an
c
h 'jc/maint-
1
.
6
.
1-
c
heck
o
ut-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Hamano
M
e
rg
e
branch '
t
c/c
l
one-v-progres
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/smart-
h
ttp-restric
t
'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge branch 'jk/run-comm
a
nd-use-she
l
l
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch '
s
r
/
gf
i
-options'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
Update C
O
PYING with GPLv2
with new F
S
F
a
ddress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C H
a
man
o
u
ser_ident_sufficientl
y
_given(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
us
e
r_ident_sufficiently_
g
iven(): refact
o
r the logi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
rerere
:
honor confl
i
ct-marker
-
s
i
ze attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hama
n
o
rerere:
pre
p
a
r
e for cust
o
miz
a
ble conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c:
:
print_summa
r
y
: do not r
e
leas
e
the forma
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Hamano
conflict-marker-
s
ize: new a
t
tribu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ha
m
ano
rerere: us
e
ll_merg
e
(
)
instead
of usi
n
g xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
merge-tree: use
l
l_me
r
ge(
)
n
ot xdl_
m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
xdl_m
e
rge():
a
llow pass
i
ng dow
n
m
arke
r
_size in x
m
p
aram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Hamano
xdl
_
merge(): introduc
e
xmparam_t for merg
e
specif
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr(): fix
f
u
n
ct
i
on signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge bra
n
c
h
'
m
aint
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
br
a
nch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Teach dif
f
tha
t
modified
submodule di
r
ectory 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
amano
grep --no-in
d
e
x
: all
o
w use of
"git g
r
e
p" ou
t
side a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Jun
i
o C Haman
o
grep: prepare to run
o
utsi
d
e of a work t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
ni
o
C
Hamano
Merge
b
ra
n
ch 'jc/che
c
kout-merge-ba
s
e'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Haman
o
Merge branch 'rs/main
t
-
a
rchive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C
H
amano
Merge b
r
anch 'il
/
vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_addbuf(): allow passing the
s
a
m
e
b
u
f to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io
C
Ham
a
no
Mer
g
e b
r
anch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
M
e
rge b
r
anch 'n
d
/sparse
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t75
0
2
: test commit
.
stat
u
s
, --status and --no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
g
r
ep: rip out pessimizat
i
on to u
s
e fi
x
match
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Hamano
grep: rip out suppo
r
t for e
x
te
r
nal
g
rep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
strbu
f
.
c
:
r
e
m
ove
u
nus
e
d
func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio
C
Ham
a
n
o
s
ha1_file
.
c: remove
u
nused funct
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
m
a
ilmap
.
c: re
m
ove unus
e
d funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
u
t
f
8
.
c: mark file-lo
c
al function
s
t
at
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
submod
u
le
.
c: mark file-l
o
ca
l
functi
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
quote
.
c: mark f
i
le-loca
l
f
u
nction
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
a
mano
remote-cur
l
.
c
: ma
r
k f
i
le-loc
a
l function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
read-
c
ache
.
c: mark file-local functions s
t
a
t
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
parse-opti
o
n
s
.
c: mark file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
entry
.
c: mark file-local
f
unct
i
on static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
mano
http
.
c: mark
fil
e
-
local fun
c
t
i
o
n
s static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio
C
Haman
o
Merge b
r
anch 'jc/maint-1
.
6
.
4-grep-lookah
e
ad' in
t
o jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C Ham
a
no
gre
p
: o
p
timize
b
uilt-in g
r
ep by skipping lines t
h
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
i
o C Ha
m
ano
g
r
ep: -L should s
h
ow
empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C
H
a
mano
pretty
.
c: mark
f
ile-
l
ocal func
t
i
o
n
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
b
u
i
ltin
-
r
e
v
-li
s
t
.
c: mark fil
e
-loc
a
l function s
t
a
t
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
bise
c
t
.
c: mark file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere f
o
rget path: forget record
e
d
r
e
s
olution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C
Hamano
rerere: refact
o
r rerere
logic
to make
it
i
n
depe
n
dent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
ident
.
c:
t
r
e
at $EMAIL as
g
iving user
.
emai
l
ide
n
tity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C
Hamano
ide
n
t
.
c: check explicit ide
n
tity for name and email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
er
g
e br
a
nch 'tr/http-upda
t
es
'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
M
e
r
ge
branc
h
'jk/ma
i
nt
-
1
.
6
.
5-res
e
t-
h
ard
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Mer
g
e b
r
anch
'jk
/
push-to-
d
elete'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge
b
ran
c
h 'mm/config
-
p
a
t
h
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Me
r
ge
branch 'pm/c
v
s-environ'
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o
C Ha
m
ano
Merge
b
ra
n
ch 'tr/maint-1
.
6
.
5-bash-p
r
omp
t
-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
Merge
branch
'
bg/maint-
r
emote-update-def
a
u
l
t'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
a
m
ano
M
e
rge b
r
anch
'
mm/di
a
g-pa
t
h-i
n
-
t
reeish'
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Ha
m
ano
Mer
g
e branch 'fc/opt-q
u
iet-gc-reset'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
mano
Merge branch
'
maint-1
.
6
.
2' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into
m
a
int-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
Mer
g
e
branch 'm
a
int-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Junio
C Hamano
ls-file
s
: fix
o
vereage
r
pathspec optimiza
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next