repo.or.cz
/
alt-git.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-21
Jun
i
o
C
Hamano
U
pdate draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Mer
g
e
b
ranch
'bw
/
cv
s
import
'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C Hamano
Merge branch 'jc
/
checkou
t
-merge-b
a
se'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge branch 'ag/patch-hea
d
er-ver
i
fy'
commit
|
commitdiff
|
tree
2010-01-21
J
uni
o
C Hamano
Merge b
r
anch 'j
c
/conflict-marker-size
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge branch '
a
g/maint
-
a
p
ply-too-l
a
rge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e bra
n
ch 'ap/m
e
r
g
e-ba
c
k
e
n
d-opts
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge b
r
anch
'nd/status-parti
a
l-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge remote branch 'remotes/
t
rast-doc/f
o
r-next'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Hamano
Merge branch 'jh/not
e
s
'
(early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge branch
'jc/maint-re
f
resh-i
n
dex-is-optiona
l
-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merg
e
branch 'rr/core-tuto
r
ial
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge branch 'jc/cache-u
n
merge'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
a
mano
Merge
b
r
a
nch 'js
/
exec-error-
r
eport'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
Merge b
r
anch 'jc/ls
-
f
i
le
s
-ignored-
p
athspec'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
erge branch 'jc/gr
e
p-look
a
head'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
M
e
r
ge
b
ranch 'jc/main
t
-strbuf-add
-
fi
x
-d
o
ubli
n
g'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
Me
r
ge branch 'mm/conflict-a
d
vi
c
e'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merg
e
b
r
a
nc
h
'
d
a/difftool'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ham
a
no
Merge branch
'mh/rebase-
f
ixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
M
e
rge
b
ra
n
ch 'ns/rebase-auto-s
q
uash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
M
e
rge
b
ranch 'mh/r
e
base-fixup' (early
p
art)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erg
e
branch 'il/push
-
set-upstrea
m
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'jk/
w
arn-author-committer-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
an
o
Merge bran
c
h 'tr/h
t
tp-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e b
r
anch 'bk/
f
ix-rela
t
ive-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge
br
a
nch 'sd/
c
d-p-show
-
toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
M
erge branch 'jc/symbo
l
-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ham
a
no
date
.
c: mark
f
ile-local functi
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
H
a
mano
S
ync wit
h
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
G
i
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Me
r
ge branch 'bg/maint-
r
emote-update-de
f
ault'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge b
r
anch 'sb
/
maint-octopus' int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'bg/maint-add-al
l
-doc
'
int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
Mer
g
e br
a
nch 'maint-1
.
6
.
5'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Ham
a
no
Gi
t
1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch '
j
k/maint-
1
.
6
.
5-reset-hard'
i
nto
m
aint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge
b
ranch
'
tr/maint-1
.
6
.
5
-
bash-prompt-show-submo
d
ule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
erge b
r
anch 'd
p
/maint-1
.
6
.
5-fast-import-no
n
-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch
'jm/ma
i
nt-1
.
6
.
5
-
grep-
N
UL-terminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C H
a
mano
Fix "checkout A
.
.
.
" synonym for "checkout
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
sta
t
us: don'
t
requi
r
e the r
e
pository
t
o be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johannes
S
ixt
M
a
kefile: honor NO
_
CURL when setting
R
E
MOTE_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Casebolt
i
d
ent
.
c: re
p
l
a
ce
f
printf with
f
pu
t
s
t
o suppress
com
p
iler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái Ngọc Duy
rm: only refre
s
h en
t
ries that we may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
a
vid Ri
p
ton
bisect: fix singular/plur
a
l
gra
m
mar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cv
s
import: standarize sy
s
tem() calls to
ex
t
ernal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: standarize open() calls to e
x
ternal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
c
v
si
m
p
o
rt: modern
i
ze call
o
u
t
s
to
g
it
s
ubcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Me
r
g
e
bra
n
ch 'main
t
-1
.
6
.
4' into
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ha
m
ano
M
e
rge branch
'maint-1
.
6
.
3' into
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch 'mai
n
t-1
.
6
.
2' into
main
t
-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
er
g
e commit
'v1
.
6
.
4
.
4-8-g8de6518'
into maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
mano
Fix mis-backport of
t700
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
U
pdate draft
rele
a
se notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
M
e
rge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
mano
Update draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o C Ha
m
a
no
Merge branch
'
dp/maint-1
.
6
.
5-fas
t
-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Me
r
ge b
r
a
n
c
h
'
jc/re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge
b
ranc
h
'pc/
u
ninte
r
esting-
s
ubmodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
M
e
rge branch 'nd/include
-
termios-fo
r
-os
o
l'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C H
a
mano
Merge b
r
anch 'js/windows
'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gruenbacher
buil
t
in-apply
.
c: fix the --- and +++ header filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Daniel
B
ark
a
l
o
w
Replace parse_blob
(
) wi
t
h an
explanatory
c
om
m
e
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge
branc
h
'jm/main
t
-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyering
grep: NUL ter
m
inate
i
nput from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
ndreas Gru
e
n
b
acher
built
i
n
-appl
y
.
c: Skip filenames without enough components
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
s
ymlin
k
s
.
c: remov
e
u
n
used func
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hama
n
o
objec
t
.
c: remove
u
nused functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Do
c
ument t
h
at merge strateg
i
es ca
n
now
t
ake their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
v
ery Penn
a
run
Extend merge-sub
t
re
e
tests t
o
test -Xsubtree
=
dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C H
a
m
a
no
Make "subtree" part mo
r
e orthogonal to t
h
e r
e
st of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C
H
a
mano
pul
l
:
F
i
x parsing
o
f -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery P
e
nnarun
T
e
ach git-pull to pass -X<opti
o
n> to git-m
e
rg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennar
u
n
git merge
-
X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
aman
o
Update 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
b
ranch 'tc/test-loc
a
t
e
-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
Hamano
Mer
g
e bran
c
h 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge branch 'jn/mak
e
fi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bra
n
c
h
'j
c
/maint-1
.
6
.
1-chec
k
ou
t
-m-custom-mer
g
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
ma
n
o
Merge branch 'tc
/
c
lone-
v
-p
r
og
r
e
s
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e
b
ranch
'
t
c
/smart-h
t
tp-re
s
trict'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hamano
Merge branc
h
'jk/r
u
n-co
m
mand-us
e
-shell'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Haman
o
Merge
bran
c
h 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Up
d
ate COPYING with
G
PLv2 w
i
th
n
e
w
F
SF addr
e
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
us
e
r
_
ide
n
t_suff
i
cient
l
y_given(): refactor the
logi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
H
a
mano
user_
i
dent
_
sufficientl
y
_
gi
v
en(
)
:
r
efact
o
r the logi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
re
r
ere: honor conflict
-
marker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hama
n
o
rerere: prepar
e
f
o
r
customiza
b
le conflict mar
k
er
l
ength
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
co
m
mit
.
c::print_summary: do not r
e
lease the for
m
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conf
l
i
c
t-marke
r
-
s
ize: ne
w
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
e
rere: use ll
_
merge() instead of usi
n
g xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
ama
n
o
merge-tree: use ll_merg
e
()
n
ot xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
H
amano
xdl_merge(): al
l
ow passing down m
a
r
k
er_siz
e
in
xmparam
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
am
a
no
xdl_merge(): introduce xmparam_t f
o
r merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
git_attr(
)
: f
i
x
funct
i
on
signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Joh
a
nnes Sixt
Do not use date
.
c:tm_t
o
_
t
ime_t
(
) from
c
o
mpat/
m
ingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next