repo.or.cz
/
git
/
jrn.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-19
Junio
C Hamano
Upd
a
te
draft release not
e
s
t
o 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Hama
n
o
Merge bra
n
ch 'dp/maint-1
.
6
.
5-fast-import-non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
g
e bra
n
ch
'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge
b
r
anch '
p
c
/u
n
interesting-s
u
bmod
u
le-dis
a
ppear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
H
amano
Merge branch 'nd/i
n
clude-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
no
M
erge branc
h
'js/wi
n
d
o
w
s'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C H
a
m
ano
Merge
b
ranch 'jm
/
m
aint
-
1
.
6
.
5-grep-NUL-terminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
symlink
s
.
c: remove
u
nused fu
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
objec
t
.
c: remo
v
e unused fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C H
a
m
ano
D
o
c
u
me
n
t t
h
at merge
stra
t
e
g
ies can now
t
ak
e
the
i
r o
w
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hama
n
o
Make "subtree" p
a
rt m
o
r
e
ortho
g
onal t
o
the re
s
t
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Ham
a
no
pull: Fi
x
parsing of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
m
a
no
Update draft relea
s
e no
t
es
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Merge branch 'tc/test-l
o
cate-h
t
t
pd
'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Ha
m
ano
Merge br
a
nch
'
j
h/commit-stat
u
s'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merg
e
branch
'
jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge b
r
anch 'jc/main
t
-1
.
6
.
1
-checkout-
m
-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
b
ranch 't
c
/
c
l
one-v-progr
e
ss'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge branch 'tc/sm
a
rt-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge b
r
anch 'jk/
r
un-command-use-sh
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
H
aman
o
Merge
b
r
anch '
s
r/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Update
C
OP
Y
I
N
G
with GPLv2 with ne
w
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
n
o
user_ident
_
sufficiently_given(): re
f
actor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
us
e
r_ident
_
s
ufficient
l
y_given():
refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hama
n
o
rerere: hon
o
r
c
o
n
fl
i
c
t
-
m
arker-siz
e
at
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepare fo
r
customizable con
f
l
ict m
a
rker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Hamano
com
m
it
.
c
:
:print_summary:
do not
r
elease the
f
ormat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
ma
n
o
confl
i
ct-marker-size: new attr
i
bute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
r
e
rere: use ll
_
merge() in
s
tead of using xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
ano
merge-tre
e
: use ll_merge() not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
amano
xdl_merg
e
(): allow pas
s
ing down marker_size in xmpara
m
_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): i
n
troduc
e
xmparam_t
for
m
erg
e
sp
e
cific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ham
a
no
gi
t
_a
t
tr(): fix function signat
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C H
a
mano
Merge branch
'cc/re
s
e
t
-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Teach
d
iff that modified submodule direc
t
ory 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 Hamano
gr
e
p
-
-no-ind
e
x: allow use o
f
"g
i
t grep"
outsi
d
e a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
gr
e
p: prepa
r
e to
r
un outside
o
f a
work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
ama
n
o
Merge branch
'jc/
c
heck
o
u
t-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C H
a
mano
Mer
g
e
branch 'rs/maint-archive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C H
a
mano
Merg
e
b
ranch 'il/vcs-hel
p
er'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_addbuf(): allow
p
assing the sa
m
e buf to
d
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
Merge branc
h
'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
Merge bra
n
ch 'nd/spar
s
e'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
t7502: test c
o
m
mit
.
status, --
s
t
a
tus and --no-sta
t
us
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip out
p
e
s
si
m
ization to us
e
fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
gre
p
: rip o
u
t
s
upport fo
r
exte
r
nal
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
i
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
s
t
rbu
f
.
c: remove unused f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
ama
n
o
sha1_fil
e
.
c: remove unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
m
ailmap
.
c: remove un
u
sed
f
unction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
no
utf8
.
c: mark file-lo
c
al functi
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
n
o
submodule
.
c
:
mark file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hama
n
o
quote
.
c: ma
r
k file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
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
Junio C
H
amano
read-cache
.
c: mar
k
file
-
l
ocal function
s
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
parse-options
.
c: mark
f
ile-local func
t
ion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
entry
.
c:
m
ark
f
ile-local
f
unctio
n
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io
C Hamano
htt
p
.
c: mark file-lo
c
a
l
fu
n
ctions s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge branch 'j
c
/maint-1
.
6
.
4
-
grep-lo
o
k
ahead' into jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
gr
e
p
:
optimize buil
t
-i
n
grep by ski
p
pi
n
g l
i
nes that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Ham
a
no
grep
:
-L should show empty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
p
r
etty
.
c: mark file
-
local f
u
nction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hama
n
o
builtin-rev-list
.
c: mark fi
l
e-loc
a
l fun
c
tion sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Hamano
bisect
.
c:
m
a
rk file
-
loca
l
function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Juni
o
C Hamano
rerere fo
r
get path: forget recorded
r
esolut
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
r
erere: refac
t
or rerere lo
g
i
c
to make it inde
p
endent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C
Ha
m
ano
ident
.
c: tre
a
t $EMAIL as giving user
.
email identity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
ide
n
t
.
c: check explic
i
t identi
t
y fo
r
name and em
a
il
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o
C
H
aman
o
Merge
b
ranch 'tr/http-updates'
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
mano
Merge branch
'
jk/maint-1
.
6
.
5-re
s
et-ha
r
d'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
Merge branch 'jk/push-to-delete'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C Ha
m
a
no
Merge branch 'mm/config-path'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Mer
g
e
bran
c
h
'pm/cvs-enviro
n
'
commit
|
commitdiff
|
tree
2010-01-10
J
uni
o
C H
a
mano
M
erge b
r
anch 't
r
/ma
i
n
t
-1
.
6
.
5-bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
J
un
i
o C Hamano
M
e
rge branch 'bg/maint
-
remote
-
up
d
ate-default'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Mer
g
e bra
n
ch 'mm/di
a
g-path
-
in-tree
i
sh'
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
m
a
n
o
Merge branch
'fc
/
opt-quiet-gc-
r
ese
t
'
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C
H
amano
Me
r
ge
b
ran
c
h '
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Ham
a
no
Merge bra
n
ch '
m
aint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
i
o C
Hamano
M
erge
b
ranch 'maint-1
.
6
.
1' into ma
i
n
t
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Haman
o
M
erge branch
'maint-1
.
6
.
0' into
maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
ls-fi
l
es: fix o
v
erea
g
er
pa
t
hspec op
t
i
m
i
zatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
J
unio C Ham
a
no
r
ead_directory(): furt
h
er split treat_pa
t
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Ju
n
io
C
Hamano
read_directory_recursive():
r
e
f
actor han
d
ling of a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Ha
m
ano
t
3
0
01: test l
s
-files -o
i
gnor
e
d/dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-08
Junio C
H
a
m
an
o
i
d
ent
.
c: remove u
n
used variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
D
e
scribe second batch for 1
.
7
.
0 in
draft release
note
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C H
a
mano
Me
r
g
e
branch 'js/filter
-
br
a
nch-p
r
ime'
commit
|
commitdiff
|
tree
2010-01-07
Junio
C H
a
ma
n
o
Merge b
r
anch 'sb/mai
n
t-octo
p
us'
commit
|
commitdiff
|
tree
2010-01-07
J
unio C Hamano
Merge branch 'mg/tag-d-sho
w
'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branc
h
'so
/
cvsserver-update'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merg
e
bran
c
h
'bg/maint-add-a
l
l
-doc'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge b
r
a
nch 'mv/commit-date'
commit
|
commitdiff
|
tree
2010-01-07
J
unio C Hama
n
o
Merg
e
branch 'mo/bin-wrappers'
commit
|
commitdiff
|
tree
2010-01-07
Junio
C
Hamano
read-tree
-
-debug-u
n
pack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o C Hamano
unpac
k
-trees
.
c: look ahead
i
n the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hama
n
o
unpack-trees
.
c: p
r
epare for looking a
h
ead in
the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
unio C
Hamano
checkout -m: do not t
r
y to fall back to -
-
merge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Jun
i
o C Hama
n
o
chec
k
out
-
m path:
fix recreating confli
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next