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
t0101: use absolute date
2010-01-19
Jun
i
o
C Hamano
Merge b
r
anch 'js/wi
n
d
o
ws'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
aman
o
Merge bran
c
h 'jm/main
t
-1
.
6
.
5-grep-NUL-t
e
rmin
a
te' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C
Hama
n
o
symlinks
.
c: remove
u
nused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
obje
c
t
.
c:
r
e
move unused functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
Docum
e
nt that
m
erge s
t
rategie
s
can now take th
e
ir o
w
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
n
o
M
a
ke
"s
u
btree" part more orthogonal to
t
h
e
rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
mano
pull: Fix parsing of
-X<optio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
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-18
Junio C Hama
n
o
M
e
rge branc
h
'tc/test-locate-ht
t
pd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Merge branch '
j
h/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge branc
h
'j
n
/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branch 'jc/maint-1
.
6
.
1-checkout-
m
-c
u
stom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
H
amano
Merge b
r
anch 't
c
/c
l
o
n
e-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge b
r
a
n
c
h
'
t
c
/
smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge branch 'jk/run-comm
a
nd-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Me
r
ge branch
'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
U
pda
t
e COPYING with GPLv2 with
n
ew FSF ad
d
ress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
user
_
ident_sufficiently_given()
:
refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
H
amano
user_ident_su
f
fi
c
iently_given()
:
refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
rerere: honor c
o
nfli
c
t
-marker
-
size
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
re
r
ere: prep
a
r
e
for customizable conflict marker l
e
ngth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ham
a
n
o
comm
i
t
.
c
:
:print_summary: do not r
e
lease
t
h
e
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
c
o
nflict-marker-si
z
e: n
e
w attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ham
a
n
o
rerere
:
use ll_merge() instead of
u
sing x
d
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
merge-tree: use ll_m
e
r
ge() n
o
t xdl
_
merge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C
Hamano
xdl_merge(): allow passing
down marker_size in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl
_
merge
(
): introduc
e
xmparam_t f
o
r
merge sp
e
cific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
git_attr():
f
ix function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Merge branch 'cc/rese
t
-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
m
ano
T
e
a
c
h
diff that
mo
d
ifie
d
sub
m
od
u
l
e
di
r
ectory is di
r
ty
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
unio C
Hamano
g
r
ep --n
o
-index
:
allow us
e
of "g
i
t
g
rep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
J
u
nio C Hamano
grep: p
r
epare to
run outside of a wor
k
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'jc/check
o
ut-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
Merge
b
ranch
'
rs/m
a
in
t
-arch
i
ve-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
erg
e
branch 'il/vcs
-
helper'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Hamano
strbuf_addb
u
f
(
): allow passing the same b
u
f t
o
d
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
M
erge b
r
anch 'cc
/
reset-mo
r
e'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
erge branch
'
n
d/s
p
arse'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C H
a
man
o
t7502: test commit
.
st
a
t
u
s,
--
s
t
atus and --n
o
-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
grep: rip out
p
essimi
z
ation to us
e
fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: r
i
p out
s
u
pport for external gre
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C H
a
m
a
no
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
strbuf
.
c: remove unus
e
d fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Ha
m
an
o
s
h
a
1
_
file
.
c
: remove u
n
used function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C H
a
man
o
mailmap
.
c: re
m
ove
unused functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
no
u
tf
8
.
c: mark file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
s
u
b
m
od
u
l
e
.
c: mark file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C H
a
ma
n
o
qu
o
te
.
c: mark file-loca
l
f
u
nctio
n
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio
C
Haman
o
remote-cur
l
.
c: mark
file-local func
t
ion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hamano
r
e
a
d
-
c
ache
.
c: mark file-local functions
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C
H
amano
parse-
o
ptions
.
c: mark fil
e
-local funct
i
on static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o
C
Ha
m
ano
entry
.
c: mark file-
l
ocal
function stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C
H
a
mano
h
ttp
.
c: mark
f
ile
-
local functions sta
t
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
Merge branch 'jc/m
a
int-1
.
6
.
4-
g
rep-
l
ookahea
d
' int
o
jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Hama
n
o
grep:
o
p
t
imize
b
u
ilt-in g
r
e
p
b
y
skipping lines that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
grep: -L should show empt
y
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
p
r
e
tty
.
c
:
mark
file-l
o
ca
l
f
u
nct
i
o
n
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
buil
t
i
n
-rev-list
.
c: mark f
i
le-lo
c
al function s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
b
isect
.
c:
mark file-lo
c
al function
s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C
H
amano
r
er
e
re forget path: forget r
e
corded resoluti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere: refac
t
or r
e
rere logic to make
i
t
independent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ha
m
ano
i
d
ent
.
c
: treat $EMA
I
L as
giving user
.
ema
i
l
i
dentity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
i
dent
.
c:
c
heck
explici
t
ide
n
tity for
n
ame
a
nd emai
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
i
o C Hamano
Merge bran
c
h
'tr/http-updates'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ham
a
no
Merge branch
'
jk/mai
n
t-1
.
6
.
5-re
s
et-hard'
commit
|
commitdiff
|
tree
2010-01-10
J
unio
C
H
a
m
a
n
o
Merge bran
c
h 'jk/push-to-d
e
l
ete'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge
branch
'm
m
/
c
on
f
ig-path'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
H
amano
Merge br
a
nch 'p
m
/c
v
s
-
en
v
i
ron'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hama
n
o
M
erge branch 'tr
/
maint-1
.
6
.
5-ba
s
h-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
Merge branch 'bg/ma
i
n
t-remote-u
p
dat
e
-default'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
H
amano
Merge branc
h
'mm/
d
iag-path-in-tr
e
e
ish'
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Ha
m
ano
Merge branch 'f
c
/op
t
-quie
t
-gc-reset'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
ama
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ha
m
ano
Me
r
g
e
branch 'ma
i
n
t
-1
.
6
.
2' into
maint
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Hamano
Merge bran
c
h
'main
t
-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
e
rge branch
'
m
aint-1
.
6
.
0' int
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Junio C H
a
man
o
ls-fil
e
s: fix ove
r
eage
r
pat
h
sp
e
c o
p
timization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
re
a
d_dire
c
tor
y
():
f
urthe
r
split treat_path
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
re
a
d_directory_recursive():
r
e
fa
c
tor handling of a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
t3
0
0
1
:
test ls-files -o
i
gnored/dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-08
Juni
o
C
H
a
mano
ident
.
c: remove unused variabl
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Ju
n
io
C
Hama
n
o
Describe se
c
o
nd b
a
tch fo
r
1
.
7
.
0
i
n dra
f
t release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
unio C
Hamano
Merg
e
branch 'js/fi
l
t
e
r-branch-
p
rim
e
'
commit
|
commitdiff
|
tree
2010-01-07
Junio C
H
a
m
ano
Merge bran
c
h 'sb/maint-o
c
topus'
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C
H
ama
n
o
Merge branch 'mg/
t
ag-d-show'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge bran
c
h
'so/cvsserve
r
-
update'
commit
|
commitdiff
|
tree
2010-01-07
Junio C
Hamano
Mer
g
e branch '
b
g/m
a
int-add-all-doc'
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o C H
a
mano
Merge branch 'mv/
c
o
m
m
i
t-date'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branch 'mo/bin-wra
p
pers
'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ha
m
an
o
re
a
d-tree --debug-unpack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
u
n
i
o C Hamano
unpack-
t
rees
.
c
: loo
k
ahead in th
e
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C
H
aman
o
unpac
k
-t
r
ees
.
c: p
r
epare f
o
r looking ahead in the in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio
C
H
ama
n
o
c
h
eckout -m: do not
try to fal
l
b
ack t
o
--merge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Junio C
H
a
mano
ch
e
ckout -m path
:
fix recreating conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Haman
o
.
gitattr
i
butes: detect 8-space inden
t
in
s
he
l
l
s
c
r
i
pts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
J
unio C Hamano
Fix
b
it assig
n
me
n
t for C
E
_CONFLICTED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Ha
m
ano
Aggre
s
sive three-wa
y
merge: fix D/F cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
tra
v
erse_trees(): handle D
/
F
c
onflict case sanely
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
J
u
nio C Hama
n
o
mor
e
D/F conf
l
ict tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next