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
H
amano
Updat
e
draft release not
e
s
t
o 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o C Hamano
Merg
e
bra
n
ch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
a
mano
Merge bra
n
ch
'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Mer
g
e
b
ranch 'ag/patch-header-veri
f
y'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
man
o
M
e
rge bran
c
h '
j
c
/
c
o
nflict
-
m
arker-s
i
ze'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge bra
n
ch 'ag/maint-a
p
ply-too-larg
e
-p'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Me
r
ge bran
c
h 'ap/merge
-
backend-
o
pts
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ham
a
no
Merge branch 'nd/status-partial-
r
efresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge remote b
r
anch 'remotes/trast-do
c
/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
amano
M
e
rg
e
br
a
nch 'jh/
n
otes' (earl
y
par
t
)
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge br
a
nch '
j
c
/
m
aint-re
f
resh-index-is-o
p
tional
-
for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge
branch 'rr/core-tu
t
oria
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'jc/cache-unmerg
e
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
M
e
rge branc
h
'
js
/
exec-error
-
report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'jc/
l
s-
f
i
l
es-i
g
no
r
ed-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'jc/grep-looka
h
ead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
erge branch
'jc/
m
aint-
s
trbuf
-
add
-
fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge bran
c
h 'mm/conflic
t
-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'da/difftoo
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge bra
n
ch
'
mh/rebase-fix
u
p'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge br
a
nch 'ns/r
e
base-auto-s
q
uash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'mh/rebase-fixup' (early
part
)
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ham
a
n
o
Me
r
ge branch 'il/push-set-u
p
stream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'jk/warn-aut
h
or-commi
t
ter-after-
c
ommit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
ano
Mer
g
e branch 'j
c
/id
e
nt'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Merge b
r
anch
'
tr/htt
p
-pus
h
-
ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge bran
c
h 'bk/fix-rela
t
i
v
e-gi
t
d
i
r-file'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Me
r
ge bran
c
h 'sd/cd-p-
s
how-topleve
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
a
n
ch 'jc/symbol-st
a
tic
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
dat
e
.
c:
m
a
r
k file-l
o
cal function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o 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
J
unio C Ha
m
ano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
Merge bran
c
h 'bg/maint-remote-upda
t
e-defaul
t
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
Merge bran
c
h 'sb/maint-octopu
s
' into
ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
amano
Me
r
g
e
branch
'
bg/maint-add-all-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
amano
Merge branch 'maint-1
.
6
.
5' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
ma
n
o
Merge branch 'jk/main
t
-1
.
6
.
5-reset-h
a
r
d' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
branch 'tr/m
a
int-1
.
6
.
5-b
a
sh-pro
m
pt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch
'
d
p
/
ma
i
nt-1
.
6
.
5-fast-
i
mp
o
r
t
-no
n
-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Me
r
g
e
branch 'j
m
/maint-1
.
6
.
5-gre
p
-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
F
i
x "checkout A
.
.
.
" s
y
n
o
nym for
"
checkou
t
A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hama
n
o
s
t
atu
s
:
d
o
n
't r
e
quire
the repositor
y
to be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Joha
n
nes
S
i
x
t
Ma
k
efile: honor NO_
C
U
RL when setting REMOTE_
C
URL_
*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarmig
a
n Casebolt
ident
.
c: replace
fprintf
with
fputs to suppre
s
s compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái Ngọ
c
Duy
rm: only ref
r
esh entries that
w
e m
a
y
tou
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
b
i
sect: fix
singular
/
plural grammar nit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: standarize system()
c
al
l
s
t
o external git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben
W
a
l
t
on
cvsimport: stan
d
ariz
e
open() ca
l
ls to e
x
ternal git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n
W
alton
cv
s
import:
m
oder
n
ize callouts to gi
t
subcomma
n
ds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint
-
1
.
6
.
4' into ma
i
n
t-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ha
m
ano
Merg
e
branc
h
'
m
aint-1
.
6
.
3' into ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e branch 'maint-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
g
e
commit 'v1
.
6
.
4
.
4-8-g8d
e
651
8
' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
ma
n
o
F
i
x mis-backp
o
rt o
f
t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Hamano
Update draft re
l
eas
e
n
o
tes t
o
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
e
rg
e
bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
U
p
dat
e
draft
r
elease notes to
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'dp/main
t
-1
.
6
.
5-
f
ast-import
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
H
a
mano
M
er
g
e branch 'jc/rere
r
e'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C
Hamano
M
erge br
a
nc
h
'pc/unin
t
erest
i
ng-s
u
b
m
odu
l
e-disappe
a
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
amano
Merg
e
b
ranc
h
'nd/in
c
lude-
t
ermios-for-
o
s
ol'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Me
r
ge branch
'js/windo
w
s'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gruenbac
h
er
built
i
n-a
p
p
ly
.
c: f
i
x the --- and +++ header f
i
lename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Barkalow
Replace
parse_blob() with an explan
a
tor
y
comme
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge
b
ranch 'jm/maint-1
.
6
.
5-grep-NUL
-
t
e
rmi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyeri
n
g
gre
p
: NUL t
e
rmi
n
ate input from
a
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gru
e
nbac
h
er
bui
l
tin-apply
.
c: Skip filenames wit
h
ou
t
enough compo
n
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
s
ymlinks
.
c: re
m
ove
u
nuse
d
f
un
c
tion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
object
.
c
: remove unused
functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
D
o
cument that
m
erge s
t
rate
g
ies can
n
ow take t
h
eir own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
enna
r
un
Extend
merge-subtree test
s
to t
e
st -Xsubtree=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hama
n
o
M
ake "subtree
"
part more orthogonal t
o
the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
pull: Fix pa
r
sin
g
of -X<
o
pt
i
on
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Teach
g
i
t-pull to pass -X<option> to git-mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
gi
t
merge -X<option
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Upd
a
te draft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
uni
o
C Hamano
Merg
e
b
r
a
nch
'tc/test-
l
ocat
e
-ht
t
pd'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
Hamano
Merge b
r
anch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merg
e
branch
'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge
br
a
nc
h
'jc
/
maint
-
1
.
6
.
1
-checkout-
m
-custom-me
r
ge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'
tc/
c
lone
-
v-progres
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge b
r
anch 'tc
/
smart-http-
r
es
t
ri
c
t'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge branch
'
j
k
/
run-comman
d
-
use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Haman
o
Merge branc
h
'
sr/gfi-optio
n
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update C
O
PYING w
i
th GP
L
v
2 wi
t
h
new FSF ad
d
ress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
use
r
_id
e
nt_suff
i
ciently_g
i
ven(
)
: refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficient
l
y_giv
e
n():
r
efacto
r
the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
rere
r
e
:
honor c
o
nflict-ma
r
ker-size a
t
t
rib
u
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ha
m
ano
rerere: pr
e
pare fo
r
c
u
sto
m
i
zable conflict mar
k
er length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
comm
i
t
.
c
:
:print_sum
m
ary: do not
release the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
conflict-marker-size:
n
e
w
attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
m
an
o
rerere
:
use
ll_mer
g
e() instead o
f
using x
d
l_merge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
merge-
t
r
ee: use ll
_
merge(
)
not x
d
l_m
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
m
ano
xdl_merge(): all
o
w pa
s
sing do
w
n marker_size in xmpa
r
am_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C Hamano
x
d
l_merge(): introduce xmparam_t for merge speci
f
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
git_at
t
r(): fix functio
n
signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Si
x
t
Do not use date
.
c
:tm_t
o
_time_
t
() from com
p
at/mingw
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next