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 'gp/maint-cvsserver'
2010-01-18
Junio
C
Hama
n
o
symlinks
.
c:
remo
v
e unus
e
d f
u
n
cti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C H
a
mano
object
.
c: rem
o
ve unus
e
d f
u
nct
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
Docum
e
nt that merge
s
trategies can
n
ow
take
their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Make "
s
u
b
t
r
ee
"
part more
orthogonal to the
r
est of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: F
i
x
p
a
r
sin
g
of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
U
p
date draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
mano
Merge branch 'tc
/
tes
t
-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Ham
a
no
Merge
branch 'jh/comm
i
t-status'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Haman
o
Mer
g
e bran
c
h 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bran
c
h 'jc/maint
-
1
.
6
.
1-c
h
eckout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
M
e
rge
b
r
anch
'tc/clon
e
-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
branch 'tc/s
m
art-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ha
m
ano
Merge br
a
n
ch '
j
k/run-c
o
mmand
-
u
s
e-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
ama
n
o
Merge branch '
s
r
/
gfi
-
o
pt
i
ons'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Update CO
P
YING with
GPLv2 with new FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
user_id
e
nt_
s
uffici
e
ntly_given()
:
refa
c
tor the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_
s
ufficientl
y
_given(): refact
o
r the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
rer
e
re: hon
o
r conflict
-
marker-size attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
rer
e
re: prepare f
o
r cust
o
mizable conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Haman
o
co
m
m
it
.
c::p
r
int_summary: do not rel
e
ase
the
form
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
conflict
-
m
a
rker-siz
e
: new a
t
tribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
re
r
er
e
:
use ll_merge() in
s
tea
d
o
f
using xd
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-
t
ree: use ll_mer
g
e() 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
p
assing down
marker_siz
e
in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hama
n
o
xdl_
m
er
g
e
(
): introduc
e
xmparam
_
t for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hama
n
o
git_attr(): fix function signa
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ha
m
a
n
o
Merge branc
h
'c
c
/reset-more
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C Hama
n
o
T
e
ach diff th
a
t modified su
b
module directory i
s
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
J
u
nio C Hamano
grep --no-inde
x
: all
o
w use
of "git gr
e
p"
o
uts
i
de a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io C Hamano
grep: prepa
r
e
to run outside of a
w
ork
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'jc/checkout
-
merg
e
-
bas
e
'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
H
a
mano
Merge
b
ranch 'rs/maint-ar
c
hive-m
a
tch-p
a
t
h
s
pec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge b
r
a
n
ch 'il/vcs-
h
el
p
e
r
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
s
trbuf
_
addbuf(): allow passin
g
t
h
e same bu
f
to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
H
a
mano
M
e
r
g
e
branch 'c
c
/reset-m
o
r
e
'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Ham
a
no
Merge bra
n
ch
'
n
d
/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Ham
a
no
t
7502: test co
m
mit
.
status,
--status
a
nd --no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C
Haman
o
g
r
ep:
rip out pessimization to use fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
g
r
e
p: rip o
u
t support for ex
t
ern
a
l
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
H
a
m
a
no
Me
r
ge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
strbuf
.
c: remov
e
unus
e
d f
u
nctio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
n
o
s
h
a1
_
f
i
le
.
c: remo
v
e unu
s
e
d function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Ha
m
ano
mailmap
.
c:
rem
o
ve
u
nused func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
ni
o
C Ham
a
no
utf8
.
c: m
a
rk file-
l
ocal functi
o
n
s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
submodule
.
c: mark file-l
o
cal
f
u
nction
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hama
n
o
quote
.
c: mark file-
l
ocal
f
u
n
c
t
ion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
no
remote-curl
.
c: mark file-local function stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
i
o C Hamano
read-cac
h
e
.
c: m
a
rk fil
e
-loca
l
functions st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Hama
n
o
parse-options
.
c: mark fi
l
e-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Ha
m
ano
e
n
try
.
c
: mark file-local fu
n
ction
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
io
C
Ha
m
ano
http
.
c: mark file-local fu
n
ctions s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hama
n
o
M
e
r
g
e bra
n
ch
'
j
c
/maint-1
.
6
.
4-
g
r
e
p-
l
o
oka
h
ead' into jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
grep: optimize b
u
ilt-in grep by skippi
n
g l
i
nes that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Ha
m
ano
gr
e
p: -L
sh
o
uld show emp
t
y fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
pretty
.
c: m
a
r
k
fil
e
-
local
f
unction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
no
bui
l
t
in-rev
-
list
.
c: mark fil
e
-local functi
o
n sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
bisec
t
.
c:
mark file
-
loc
a
l fun
c
tion
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Ham
a
no
r
erere forget path: fo
r
get recorded res
o
lution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere
:
r
efac
t
or rerere logic to make it indepen
d
ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
ident
.
c
: treat $EMAIL as giving
user
.
email identity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hama
n
o
ident
.
c: check
e
xpl
i
cit identity for
name and e
m
ail
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Ham
a
no
Me
r
g
e branch 'tr
/
http-up
d
ates'
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C
H
ama
n
o
Merge branch 'jk/maint-1
.
6
.
5-r
e
set
-
hard'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C Ham
a
n
o
Mer
g
e bran
c
h 'jk/
p
ush-to-delete'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C H
a
mano
Me
r
ge branch 'mm/
c
onfig-path'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
Merge branch 'p
m
/cv
s
-env
i
ron
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'tr/maint-1
.
6
.
5-bash-p
r
ompt
-
show-submod
u
le
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Ham
a
no
Merge branch
'
bg/maint-remote-
u
pdate
-
d
efault'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Ham
a
no
Me
r
ge bra
n
ch 'mm
/
diag-path-i
n
-treeish'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge b
r
anch 'fc/opt
-
quiet-gc-re
s
e
t'
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Hamano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
M
e
rge branc
h
'maint-1
.
6
.
2'
into maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge br
a
nch 'maint-1
.
6
.
1' into
m
ain
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
e
rge
branch
'
ma
i
n
t
-1
.
6
.
0' into ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Ju
n
io C Ha
m
a
no
ls-fil
e
s:
fix overeager pathspec optimization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Jun
i
o C
H
amano
read_directory(): further spl
i
t
t
reat_p
a
th()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Juni
o
C Hamano
r
e
ad_di
r
e
ctory_recursive()
:
re
f
a
ctor hand
l
ing of a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
t300
1
: t
e
st ls-fi
l
e
s
-o ign
o
red
/
d
i
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-08
Junio C Hamano
ident
.
c
:
remov
e
unused v
a
r
iables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C
H
amano
Desc
r
ib
e
s
e
cond batch for 1
.
7
.
0 in draft release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C Hama
n
o
Merge branch 'js/filt
e
r
-
bran
c
h-prime
'
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o
C Hamano
Merge branch
'sb/ma
i
n
t
-
octopus'
commit
|
commitdiff
|
tree
2010-01-07
J
u
n
i
o C Hamano
Merge branch 'mg/t
a
g-d-show
'
commit
|
commitdiff
|
tree
2010-01-07
J
unio C Hamano
M
erge bran
c
h '
s
o/cvsserve
r
-update'
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Ham
a
no
Merge branch 'bg
/
maint-add-all-doc'
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C Hamano
Merge br
a
nch 'mv/commit-date'
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Hamano
Merge branc
h
'mo/bin-wrappers'
commit
|
commitdiff
|
tree
2010-01-07
J
u
n
io C Ha
m
ano
read-tree --de
b
ug
-
u
npack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
unpack-trees
.
c: look
a
h
e
ad in
the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C
H
a
ma
n
o
u
npack-tr
e
es
.
c: prep
a
re for looking
a
he
a
d in the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C H
a
mano
c
hecko
u
t
-m:
d
o not try to fal
l
back
t
o
--merge
f
r
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Jun
i
o C H
a
mano
checkout -m
path: fix
r
ecreatin
g
co
n
f
l
icts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Hamano
.
gitattribut
e
s: det
e
ct 8-space
i
nde
n
t
in shell
s
cripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Ju
n
io
C
Hamano
Fix b
i
t
a
ssignment for CE_CONFLICTED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Aggressive three-way merge: fix D/F cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C
H
amano
traverse_t
r
ees(): hand
l
e D/F conflict
c
ase san
e
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
more D/F confl
i
c
t tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio
C
Hamano
tests: move conven
i
enc
e
regex
p
to
mat
c
h
o
bjec
t
na
m
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Ju
n
io C Ham
a
no
"reset --merge"
:
f
i
x unmerged case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next