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
Update draft release notes to 1.7.0
2010-01-20
Junio
C Hamano
Merge br
a
nch 'm
a
i
nt-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Merge bra
n
ch 'jk/m
a
int-1
.
6
.
5-
r
eset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
Merge b
r
anch 'tr/main
t
-1
.
6
.
5-bash-prompt-
s
how-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'dp/maint-1
.
6
.
5-fast-import-non
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'j
m
/mai
n
t-1
.
6
.
5-gre
p
-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Tea
c
h @{upstre
a
m
} sy
n
tax
to strbuf_bra
n
cha
n
me()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
t150
6
: m
o
r
e
t
e
st for @{upstre
a
m} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Fix "check
o
ut A
.
.
.
"
sy
n
onym
f
o
r "checkou
t
A
.
.
.
H
EAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status: don't require the
repository to
b
e writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C
Haman
o
Merge branch 'maint-1
.
6
.
4'
i
nto main
t
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ham
a
no
M
erge b
r
anch 'maint-1
.
6
.
3'
into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-1
.
6
.
2'
into
m
aint
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v1
.
6
.
4
.
4-8
-
g8de6518' into
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Fix mis-b
a
ckport of
t
70
0
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hama
n
o
U
p
d
a
te draft release not
e
s to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
amano
Update
draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
M
e
r
g
e
branch '
d
p/maint-1
.
6
.
5-fast
-
import
-
non
-
comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C Hamano
M
e
r
ge b
r
anch '
j
c
/
re
r
e
re'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge
branch 'pc
/
uninteresting-submod
u
l
e-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge branch 'nd/include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge
br
a
nch
'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
e
rge branch 'jm/maint-1
.
6
.
5-grep-NU
L
-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
symli
n
ks
.
c: remove unused fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Haman
o
ob
j
ec
t
.
c: remove
unused func
t
ion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
man
o
D
o
cu
m
ent
t
h
at me
r
ge strategies can now take the
i
r own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Make "
s
ubtree
"
part mo
r
e
o
r
thog
o
nal to
t
he rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
pull: Fix p
a
rsing of
-X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
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
Junio C Ham
a
no
Merge
b
ranch 'tc/tes
t
-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch
'j
h
/com
m
it
-
status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
an
o
M
erge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge b
r
a
n
ch 'jc/maint-1
.
6
.
1-che
c
kout-m-custom-m
e
rge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ha
m
an
o
Mer
g
e branch 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge bran
c
h 'tc/smart-ht
t
p-rest
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hama
n
o
Merge
branc
h
'jk/run-comma
n
d-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Me
r
ge bra
n
ch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Update COPYING wi
t
h
GP
L
v2 wit
h
ne
w
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
user_ident_sufficiently_given(): ref
a
ctor
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_
i
dent_
s
ufficiently
_
g
iv
e
n(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
rerere:
honor
con
f
l
i
ct-marker-size
a
t
tribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
e
rere: p
r
e
p
a
re for customiza
b
le co
n
flict
m
arker le
n
gth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ham
a
no
commit
.
c::print_summa
r
y: do not release
t
h
e
for
m
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C H
a
mano
conflict-marker-size:
new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
rerere: u
s
e ll_merge() instea
d
of using
x
dl_merg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
m
erge-t
r
ee: use ll_merge(
)
not xdl_merg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C Hama
n
o
xd
l
_
mer
g
e(): allow pass
i
n
g
dow
n
m
a
r
ker_size in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge()
:
i
n
troduce xmpa
r
am_t for merg
e
spe
c
ific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Haman
o
git_attr(): fix fu
n
ction
s
ignature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge bra
n
ch 'cc
/
reset-more
'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Hamano
Te
a
ch diff tha
t
modified submodule direct
o
ry 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
grep --no-i
n
dex: allow use of "gi
t
g
r
e
p"
o
utsid
e
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io C Haman
o
g
r
e
p: p
r
epare to r
u
n outside of a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merge branc
h
'j
c
/c
h
e
c
k
o
ut-
m
erge-base'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C
H
amano
Mer
g
e
branch 'rs/ma
i
nt-archive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Hama
n
o
M
erge
b
ranch 'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio
C
Hamano
s
t
rbuf_addb
u
f():
a
llow pa
s
sing t
h
e
same
b
uf
t
o dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Ham
a
no
Merge branch 'cc/reset-mor
e
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
a
mano
Mer
g
e
bran
c
h 'nd/s
p
arse
'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
t750
2
: test co
m
mit
.
s
t
atus,
-
-status and -
-
no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
g
rep: rip o
u
t pessimizati
o
n
t
o
u
se f
i
xmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
g
rep: rip ou
t
support for e
x
t
e
rnal grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io
C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
H
amano
s
t
rbuf
.
c:
r
emove un
u
sed function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
no
sha1_file
.
c: remove unus
e
d functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
am
a
no
mailmap
.
c
:
remove un
u
sed
f
unc
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Ham
a
n
o
u
tf
8
.
c: ma
r
k
f
i
le-local function
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C Hamano
submodule
.
c: mark
file-local funct
i
on static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Hamano
quote
.
c: mark file-local
function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hama
n
o
remote-curl
.
c: m
a
rk file-lo
c
al functi
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
read-cache
.
c: mark
f
ile-local functions stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
parse-options
.
c
:
mar
k
file-local function
s
tat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
a
m
a
n
o
entry
.
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 Hamano
h
t
tp
.
c: ma
r
k
file-l
o
cal function
s
stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C Hamano
Mer
g
e bran
c
h 'jc/
m
a
in
t
-1
.
6
.
4-grep-look
a
head'
i
nto jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
grep: o
p
ti
m
ize buil
t
-
i
n grep by skipp
i
ng li
n
es t
h
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C
H
am
a
no
g
rep: -L should
s
ho
w
e
m
pty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
p
retty
.
c
:
m
a
rk
file-l
o
cal function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
b
u
ilt
i
n-r
e
v-lis
t
.
c:
m
a
r
k
file-local fu
n
ction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
bis
e
c
t
.
c: mar
k
file-l
o
cal func
t
ion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C
Hamano
rerere forget
p
ath: forget recorded resol
u
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hama
n
o
rerer
e
:
refactor rerere
l
o
g
ic to make
i
t i
n
dependen
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
ident
.
c
: treat $EMA
I
L a
s
givin
g
user
.
email identity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Haman
o
ident
.
c: check expli
c
it id
e
ntity for name and e
m
ail
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge b
r
a
nc
h
'tr/
h
t
tp-updates'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'jk
/
maint-1
.
6
.
5-reset-hard'
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
man
o
M
e
r
ge bran
c
h 'jk/
p
ush-to-delete'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hama
n
o
Merge branc
h
'mm/co
n
fig-path'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
amano
Merge branch 'pm/cvs-envir
o
n
'
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio
C
Ham
a
no
Me
r
ge br
a
nch 'tr/maint-1
.
6
.
5
-
b
a
s
h
-
prompt-sh
o
w-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Ham
a
no
Merge branch 'bg
/
m
a
int-rem
o
t
e-updat
e
-defa
u
lt'
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o
C H
a
m
ano
Merge bran
c
h
'
mm/diag-p
a
th-i
n
-treeish'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge bra
n
c
h
'
f
c/opt
-
quiet
-
gc-reset
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Haman
o
Me
r
ge branch
'm
a
int'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
Merge
b
r
anch 'ma
i
nt-1
.
6
.
2
' i
n
to maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
mano
Merg
e
branch 'maint-1
.
6
.
1
'
into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hama
n
o
M
e
rge branch 'main
t
-1
.
6
.
0
' in
t
o maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
next