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
Merge branch 'maint'
2010-01-22
Junio C Ha
m
an
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-22
Linu
s
To
r
valds
make "git hash-object" a
built
-
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
i
nus Torvalds
make
"
g
it merge-tre
e
" a
b
uilt-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus To
r
valds
slim down "g
i
t
s
how-i
n
dex"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
Remove dif
f
m
a
chinery dependency f
r
om r
e
a
d-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hama
n
o
m
erge-rec
u
rsive:
do not r
e
t
urn
N
U
LL only to c
a
use segfaul
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Horst
H
.
von Brand
git-r
e
base
.
txt: Fix spel
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Tay Ray Chua
n
re
t
ry req
u
est
w
ithout que
r
y when
info
/
refs?q
u
ery fai
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johannes Six
t
Make 'rere
r
e
for
g
et' work from a su
b
d
i
r
ectory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Joh
a
nnes Sixt
Make te
s
t case numbers
uniqu
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
conflict-mar
k
er-size: a
d
d test
a
nd docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
mano
Update draft release note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Haman
o
Merge
b
ran
c
h 'b
w
/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge branch 'jc/checkout
-
merge-base'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ha
m
ano
Merge branch 'ag/patch-h
e
ad
e
r-verify
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Merge branch 'jc/conflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge br
a
nch 'ag/mai
n
t-apply-to
o
-large-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ha
m
a
n
o
Merge bran
c
h
'
ap/merge-backend-opt
s
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge branch 'nd/st
a
t
u
s-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Merge remote
b
ranch 'remotes/trast-doc/
f
or-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merg
e
bran
c
h 'jh/notes' (early
p
art)
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ha
m
ano
Merge b
r
anch
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge br
a
nch 'jc/main
t
-re
f
resh-index-is
-
opt
i
onal
-
for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch 'rr/core-t
u
torial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
erge branch 'jc/cache-un
m
erge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch
'
js/e
x
ec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branc
h
'jc/ls-file
s
-
ignored-pa
t
hs
p
ec'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
M
e
rge
b
ranch
'
jc/g
r
ep-lookahea
d
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
M
e
rge bran
c
h 'jc
/
maint-strbuf-add-fi
x
-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Mer
g
e
branch
'
mm/conflict
-
advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'da
/
diffto
o
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
Merge branch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ra
n
ch 'ns/reb
a
se-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh/r
e
base-fixup' (
e
arly part
)
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
Merge branch 'il/push-set-upstream
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'jk/warn-author-co
m
mi
t
t
er-af
t
er-commit'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C
H
am
a
no
Merge b
r
anch
'
jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Haman
o
Me
r
ge bran
c
h 't
r
/
ht
t
p
-pu
s
h-ref-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
Merge bra
n
c
h 'bk/fix-relative
-
g
i
td
i
r-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'sd/cd-p
-
sh
o
w-to
p
le
v
el'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'j
c
/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
date
.
c: ma
r
k
file-local function sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
S
ync w
i
th 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ham
a
n
o
Gi
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
a
n
o
Merge branch 'bg/maint-remote
-
update-default' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C Ham
a
no
M
e
rge branch 's
b
/maint-
o
ctopus' into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
M
er
g
e branch
'
bg/maint-add-a
l
l
-
do
c
' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge br
a
n
ch 'main
t
-1
.
6
.
5' i
n
to main
t
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch '
j
k/main
t
-1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
erg
e
branch 'tr/maint-1
.
6
.
5-ba
s
h-prom
p
t-s
h
o
w
-submodu
l
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
Merge branch '
d
p/maint-1
.
6
.
5-fast-import-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
amano
Merge
b
r
a
nch
'
jm/maint-
1
.
6
.
5-g
r
e
p
-NUL-
t
ermi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Fix "checkout
A
.
.
.
" s
y
nonym for
"
che
c
kout A
.
.
.
H
EAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
s
t
atus: don't
require the repository
t
o be
writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Makefile: honor
N
O
_CURL when se
t
ting REM
O
TE
_
CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ta
r
migan Casebolt
ident
.
c: repl
a
ce
f
print
f
with f
p
uts to
s
up
p
ress
c
ompiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái Ngọc
Duy
r
m
:
only refr
e
sh entr
i
es th
a
t we may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
bi
s
ect: fix singu
l
ar/p
l
ural grammar
nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wa
l
ton
c
vsimport: standarize
s
ystem() cal
l
s to
e
xternal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: standariz
e
open() c
a
l
l
s to extern
a
l git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wa
l
ton
cvsimport: modern
i
ze
callo
u
ts to git subcomma
n
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
no
M
e
rge branch
'
m
a
i
n
t
-1
.
6
.
4' into
m
aint
-
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
Junio C Hamano
Merg
e
br
a
nch 'maint-1
.
6
.
2
' into main
t
-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge commit '
v
1
.
6
.
4
.
4-8-g8de6518'
i
nto
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix
mis
-
ba
c
kp
o
rt of t
7
002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
U
p
date d
r
aft
release notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Update draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branch 'dp/maint-1
.
6
.
5-fast-import-n
o
n
-
c
o
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Haman
o
Merg
e
b
ranch 'jc/rer
e
r
e
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge
branch
'pc/unin
t
erest
i
ng-submodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'n
d
/inc
l
ud
e
-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Ham
a
n
o
Merge
b
r
anch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gruenb
a
cher
buil
t
in-apply
.
c: f
i
x the --- and +++ header
filenam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Danie
l
Bark
a
low
Replace pars
e
_bl
o
b() with
an e
x
planatory
c
omment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Hamano
M
e
r
ge branch
'jm/maint-1
.
6
.
5-gr
e
p-NUL-t
e
rminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
im
Meyering
grep:
NUL terminate inp
u
t from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
An
d
r
e
as Grue
n
ba
c
her
builtin-app
l
y
.
c: S
k
ip filenam
e
s
w
ithout enough com
p
on
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C
Hamano
s
ymlinks
.
c
:
remove unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
o
bject
.
c
:
remove unused
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Doc
u
ment that merge strategies
can now take t
h
ei
r
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Ext
e
nd merge-
s
ubtr
e
e test
s
to test -Xsubtree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subtree" par
t
m
ore orthogonal to 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
sing of -X<opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
v
e
r
y
Pennarun
Teach git-pull to pass -X
<
option> t
o
git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennar
u
n
git merge -X<
o
ption>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
Hama
n
o
U
pd
a
te draft releas
e
n
o
t
e
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Me
r
ge branch 'tc/te
s
t-lo
c
ate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Merge
branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Mer
g
e branch
'
jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Mer
g
e branch 'j
c
/maint-1
.
6
.
1-checkout-m-cust
o
m-me
r
ge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/clone-
v
-pr
o
gress
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
M
e
rge
b
r
a
nch 'tc/smart-http-r
e
s
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
n
o
Merge branch 'jk/ru
n
-comm
a
nd-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge branch 'sr/gf
i
-options
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Ham
a
no
U
pdate COPYING
with GPLv
2
with ne
w
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Hamano
use
r
_ident_suffici
e
ntl
y
_gi
v
en(): refactor t
h
e logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next