repo.or.cz
/
git
/
jnareb-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
Junio
C
Ha
m
ano
U
p
date d
r
af
t
re
l
e
a
se
n
o
te
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
M
erge branch 'bw
/
cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Mer
g
e
b
ran
c
h
'
jc/c
h
eckout
-
merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'ag/
p
a
t
ch-hea
d
er-verify'
commit
|
commitdiff
|
tree
2010-01-21
J
un
i
o C Hamano
Mer
g
e br
a
nch 'j
c
/co
n
flict-marker-s
i
ze'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge b
r
anch
'
ag/maint-apply-t
o
o-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Me
r
ge branch 'ap/merge-
b
a
ck
e
nd-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge branch
'
nd/
s
ta
t
us-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C Hamano
Merge
r
emote br
a
nch 'remotes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge
b
ranch '
j
h/not
e
s' (early
part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
ma
n
o
Merge
b
r
anch
'jc/maint-refr
e
sh-index-
i
s-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'rr
/
c
ore-tut
o
ria
l
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Merge b
r
anch
'jc
/
cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch
'
j
s/exec
-
err
o
r
-
report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
e
rge branch 'jc/ls-files-ig
n
ored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/grep-lookahead
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch
'j
c
/main
t
-strbuf
-
a
dd-fi
x
-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge
bra
n
ch 'mm/con
f
l
i
c
t-advice'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C
Hamano
M
e
rge bran
c
h
'd
a
/d
i
f
fto
o
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch
'
m
h
/reb
a
se-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'ns/rebas
e
-auto-squa
s
h'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hamano
Merge branch 'mh/rebase-fixup' (ea
r
ly
p
art)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
M
erge br
a
n
c
h 'i
l
/p
u
sh-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
Merge branch 'jk/war
n
-author-com
m
itter-after
-
com
m
i
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
b
ranch 'j
c
/
i
dent'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'tr/http-push-re
f
-statu
s
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merge branch 'bk/fix-relati
v
e-gitdir
-
file
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
Merge br
a
nch '
s
d/cd-p-show-toplev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
e
rge branch 'jc/symb
o
l-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
date
.
c:
m
ark
file-loca
l
func
t
ion
sta
t
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Sync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch 'bg/m
a
int-remo
t
e-update-d
e
faul
t
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
M
e
r
ge
bran
c
h 'sb/maint-octopus' into
m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
b
ranc
h
'b
g
/maint-add-all
-
doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Me
r
ge branch '
m
aint-1
.
6
.
5
'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
G
i
t 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'jk/maint-1
.
6
.
5
-reset-hard' into ma
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
mano
M
erge
branch 't
r
/mai
n
t-
1
.
6
.
5-bash-prompt-show
-
submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
bran
c
h
'
d
p/main
t
-1
.
6
.
5-fast-imp
o
r
t
-non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branc
h
'jm/maint-1
.
6
.
5-grep-NU
L
-
terminate
'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "ch
e
ckout
A
.
.
.
" synonym fo
r
"
c
hec
k
out A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
s
t
atu
s
: don't
require the repository
t
o be
wri
t
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Mer
g
e branch '
m
aint
'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Makefile: hon
o
r NO_CURL whe
n
se
t
t
i
ng
R
E
MOTE_CU
R
L_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan
C
asebolt
i
d
ent
.
c:
replace fprintf w
i
th
f
p
uts to suppress
c
ompiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
N
guyễn
T
h
ái N
g
ọc Duy
r
m: only ref
r
esh e
n
t
ries tha
t
w
e may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Da
v
id Ripton
bisect: fix
s
ingular/plural gramma
r
n
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wa
l
ton
cvsimport: stand
a
riz
e
system() calls to
external git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvs
i
mport: standarize open() calls
t
o ex
t
ern
a
l
gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimp
o
rt:
m
oderni
z
e
callouts to git su
b
c
o
mman
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
M
erge branch
'maint-1
.
6
.
4'
i
n
t
o maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ham
a
n
o
Me
r
ge branch
'
maint-1
.
6
.
2
'
into
maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v1
.
6
.
4
.
4-8-g8d
e
6
5
1
8' into
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Fix mis-backport o
f
t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
p
da
t
e draft rel
e
ase
notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ha
m
ano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
p
date
draft
rel
e
ase notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Me
r
ge branch '
d
p/maint
-
1
.
6
.
5-fast-im
p
ort-non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
Merge branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Haman
o
Mer
g
e b
r
anch
'pc/unint
e
re
s
t
ing-submodule-
d
isappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch
'nd/in
c
lude-termi
o
s
-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C
Hamano
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andreas
Gruenbacher
bu
i
lt
i
n-apply
.
c: f
i
x the --- an
d
+++ h
e
ade
r
f
i
lename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Ba
r
kalow
Replace parse_blob() with an
e
xplanatory comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'j
m
/
m
a
int-1
.
6
.
5-grep-
N
UL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyering
gre
p
:
N
UL termi
n
a
t
e input from
a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gruenba
c
he
r
builtin-apply
.
c: Skip fil
e
na
m
es without enou
g
h component
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
Hamano
s
ymlin
k
s
.
c
:
rem
o
ve
unused f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
ob
j
e
c
t
.
c: remove
u
nused
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Ham
a
no
Document tha
t
merge strate
g
ies
c
an now take their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y Pennarun
Ext
e
nd merg
e
-subtree tests to t
e
st
-
X
s
ubtree=
d
i
r
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Ha
m
a
n
o
Mak
e
"subtree" part m
o
re orthog
o
nal to t
h
e rest
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
p
u
ll: Fix parsi
n
g of -X<o
p
tion>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Av
e
r
y
Pen
n
arun
T
each
git-pu
l
l to p
a
ss -X<opt
i
on>
t
o
git-merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y Penna
r
un
git merge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
aman
o
Upd
a
t
e
dr
a
ft release notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
M
er
g
e
branch 'tc/test-lo
c
at
e
-
htt
p
d'
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
amano
Me
r
ge
b
ranch
'
jh/commit-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge branch '
j
n/m
a
kefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ham
a
no
Mer
g
e branch
'jc/mai
n
t-1
.
6
.
1-checkout-m
-
custom-me
r
ge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge branch '
t
c/clone-v-progr
e
ss'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge b
r
anch 'tc/sm
a
rt-http-res
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'jk/run-co
m
mand-us
e
-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Merg
e
branch 'sr/
g
f
i
-
o
ptions'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update COPYING with GPLv2
with new FSF ad
d
ress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficientl
y
_given(): r
e
factor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficie
n
t
ly
_
given():
r
efactor t
h
e lo
g
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor conflict-marker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
r
e
r
e
re
:
pr
e
pare for customiza
b
l
e
c
o
nflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C H
a
mano
c
ommit
.
c:
:
prin
t
_summ
a
ry:
d
o not release
the forma
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Haman
o
conflict-
m
arker-size: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
r
ere
r
e: use
l
l_merge()
i
nstead of
us
i
ng xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
H
amano
merge-tree: use ll_merge() no
t
xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
xdl
_
m
e
rge
(
): allow passin
g
down marker_size in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C
Hamano
xdl_
m
erge(): intro
d
uce xmparam_t for merge s
p
ecific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C Ha
m
a
n
o
git_
a
ttr(): fix function si
g
n
a
ture
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Joh
a
nnes Sixt
D
o not use date
.
c:tm_to_t
i
me_t(
)
f
rom
c
omp
a
t/m
i
ngw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next