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-recursive: never leave index unmerged while recursing
2009-05-10
Dave Olszews
k
i
merge-re
c
ursive: never leave inde
x
un
m
erged while re
c
ur
s
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
G
I
T 1
.
6
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
ma
n
o
Me
r
g
e branc
h
'
n
p
/
maint-
n
o
-ofs-
d
elta' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch
'
main
t
-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio C
Hamano
GIT
1
.
6
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
J
u
n
i
o C
H
amano
M
e
rge branch 'jc/maint-read-tree-multi' into
m
aint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
Merge b
r
a
n
ch 'mk/ma
i
nt-apply-s
w
ap' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Ham
a
n
o
M
e
rge b
r
anch
'mm/maint-add-p-quit'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
M
erg
e
branc
h
'lt/pack-object-mem
u
se' int
o
maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
H
amano
Merge branch 'jc/
m
aint-1
.
6
.
0-keep-pac
k
' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Hamano
Merge br
a
n
c
h
'jc/maint-1
.
6
.
0-diff-
b
orrow
-
car
e
f
ully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hama
n
o
M
erge b
r
anch 'b
s
/maint-1
.
6
.
0-tree-walk-pre
f
i
x
' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Nicola
s
Pitre
h
onor
repack
.
usedel
t
abaseoffset
w
he
n
fetch
i
ng packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
Merge branch
'maint
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-29
Junio C H
a
mano
Merge bran
c
h 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
diff -c -p: do not
d
ie on submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Mer
g
e br
a
nch '
m
aint-1
.
6
.
1'
into
m
aint
commit
|
commitdiff
|
tree
2009-04-28
Junio C Ham
a
n
o
M
erge b
r
anch 'maint-1
.
6
.
0' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-28
L
inus
Torvalds
grep: fix segfault
w
hen "git grep
'('" is giv
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
A
llan C
a
ff
e
e
Doc
u
mentat
i
on: f
i
x
a
grammatical error in api-
b
uilt
i
n
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
A
l
la
n
Caf
f
ee
builtin-merge:
f
ix a typo in an error mes
s
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Ju
n
io C H
a
m
a
no
Mer
g
e
b
r
a
nch 'maint-1
.
6
.
1' i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Merg
e
branch 'ma
i
nt-1
.
6
.
0' int
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
St
e
phe
n
Boyd
t
e
st-genra
n
d
o
m: Add newlin
e
to usage string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedrowicz
tes
t
s: make tes
t
-apply-criss-
c
ross-re
n
a
m
e mor
e
robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał Ki
e
drowicz
bu
i
l
t
in-apply: k
e
ep
information about
files t
o
be deleted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedr
o
wicz
tests: test applying cri
s
s-cross rename pa
t
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Frank Lichten
h
eld
gitcvs-migratio
n
: Link t
o
git
-
cv
s
i
m
port document
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Johannes Schind
e
lin
Fix off-by-on
e
in read_tr
e
e_recursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C Hamano
che
c
kout
b
r
a
nch: prime cache-tre
e
full
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
H
am
a
no
read-tr
e
e -m A
B: prime cache-tree from t
h
e switc
h
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Jun
i
o
C Ha
m
a
no
Mo
v
e prime_c
a
che_tree() to cache-tree
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
unio C Hamano
read
-
tree A B: do not corrupt cache
-
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
W
i
ncent
C
o
l
aiuta
g
it add -p: add miss
i
ng "
q
" to patch p
r
ompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
H
amano
GIT
1
.
6
.
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Nguyễn Thái Ngọc
D
uy
Makefile: remove {fe
t
c
h
,send}-
p
a
c
k from PROGRAMS
a
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Junio C Ha
m
ano
Merge branch
'ef/ma
i
nt-fast-export
'
into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-04-19
Junio C Hama
n
o
Merge
b
ranch
'mm/main
t
-add-p-quit' into maint
commit
|
commitdiff
|
tree
2009-04-19
J
unio C Hamano
Merge
b
ranch 'lt/maint-reflog-expire' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-04-19
Junio
C
Hamano
Merge
bra
n
ch '
j
c/maint-shared-l
i
terally' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Mo
y
Update gi
t
-
a
dd
.
txt according to the new
possibil
i
ties
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
J
e
ff King
a
d
d-in
t
eractiv
e
: refactor mode hu
n
k ha
n
d
ling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu
Moy
git add -p: new "quit
"
comm
a
nd at the prompt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Ju
n
io Hamano
Speed
u
p re
f
log pruning
o
f
u
nre
a
chable c
o
mmits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Linus
Torvalds
C
l
ea
n
u
p
r
e
fl
o
g unreachab
i
lity pruning d
e
cision
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
E
r
ik Faye-Lund
bu
i
l
t
in-fa
s
t-expo
r
t
.
c
:
handle nested tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
E
ri
k
F
aye-Lund
b
u
iltin-fas
t
-export
.
c: fix cra
s
h on tagge
d
trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye-Lund
builtin-fast-export
.
c: turn error into w
a
rning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Eri
k
Faye-L
u
nd
t
e
st-suite: adding a
test for fast-
e
xp
o
rt with tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Describe fixes s
i
nce 1
.
6
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Ju
n
io C Hamano
Merg
e
branch 'main
t
-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-18
Junio C
H
amano
M
e
rge bran
c
h 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
J
u
nio C Hamano
Merge
br
a
n
c
h 'bs/maint-1
.
6
.
0-t
r
ee-walk-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Juni
o
C
Hamano
Merge branch '
j
s/maint-
s
ubmodule
-
c
h
eckout' into maint
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hama
n
o
Merge
b
ranch 'cb/maint
-
m
er
g
e-recursive-submodule-fix
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Markus Heidelberg
doc/git-da
e
mon: add m
i
ssin
g
arg
u
ments to max-connections
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merge bran
c
h 'ma
i
nt-1
.
6
.
0'
into main
t
commit
|
commitdiff
|
tree
2009-04-18
M
a
rkus He
i
d
elberg
doc/
g
it-daemon: ad
d
missin
g
arguments to o
p
t
io
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Frank Licht
e
nheld
init: Do not
s
egfault on big
G
IT_TEM
P
LATE_DIR env
i
ronment
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Pa
u
l Bolle
ima
p
-send: use
c
orre
c
t configu
r
ation
variable in documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
U
pdate d
o
cs on behaviour of 'core
.
s
har
e
dReposito
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/gi
t
attributes: clarify
l
o
c
atio
n
of
c
onfig text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio C
Hamano
Merge branch 'm
a
i
nt-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-18
Junio C
Hamano
Merge
b
ran
c
h 'main
t
-1
.
6
.
0' int
o
ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Th
o
mas
J
arosch
Fix
b
uf
f
e
r overfl
o
w in confi
g
parser
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-16
Ulrich Windl
git-apply
:
f
i
x option
d
esc
r
iption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Linus Torvalds
s
h
ow_object(): pu
s
h path_na
m
e
(
) call further down
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
L
i
n
u
s Torvalds
process_{tree,blob}: show objects without buffering
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Juni
o
C
Ha
m
a
n
o
GIT
1
.
6
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Junio
C
Hamano
Merge
b
r
a
nch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-12
Junio C
H
amano
Me
r
g
e
branch 'maint-1
.
6
.
0'
into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-12
Daniel
Chen
g
(aka
.
.
.
State the
e
f
fect of filter-branch on graft expl
i
ci
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
L
inu
s
T
o
r
valds
proc
e
s
s
_
{
tree,blob
}
:
R
emove us
e
less xstrdup cal
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Johannes Sixt
t130
1
-
s
hared-r
e
po:
f
ix forced
m
o
d
es test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
J
u
nio
C
H
amano
Start 1
.
6
.
2
.
3 preparation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ha
m
ano
Mer
g
e branch
'jc/shared-literally' into m
a
int
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge branch 'jc/m
a
int-1
.
6
.
0-diff-borrow-care
f
ully
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ham
a
no
M
e
r
ge
b
ra
n
c
h
'maint-1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-04-09
Junio
C
Ham
a
no
Merge b
r
anch '
m
aint-1
.
6
.
0'
i
n
to maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Junio C
Hamano
Merge br
a
n
ch 'jc/maint
-
1
.
6
.
0-kee
p
-pack'
i
nto main
t
commit
|
commitdiff
|
tree
2009-04-09
J
unio C Hamano
Merge branch 'jc/maint-1
.
6
.
0-bla
m
e
-
s
'
into m
a
int-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
M
erge bra
n
ch '
b
c/maint-
1
.
6
.
1-br
a
nch-delet
e
d-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
J
u
nio C Haman
o
M
e
r
ge branch '
j
s/maint-1
.
6
.
0
-
exec-path-env' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C
H
a
mano
Me
r
ge branch 'tr/ma
i
nt-1
.
6
.
1-doc-format-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Björn
Steinbrink
process_{tree,blob}:
Remo
v
e
u
s
eless xstrdup calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
M
oy
g
it-pull
.
sh:
b
etter warni
n
g message for "git
pull"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
J
unio C Ha
m
ano
Me
r
g
e branch 'main
t
-
1
.
6
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-08
Jari Aalto
Change
d
ouble
quotes
t
o single quo
t
e
s in me
s
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
M
e
rge bra
n
ch 'maint
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
Jaso
n
Merril
l
Docu
m
entation: clarif
y
.
git
a
tt
r
ibutes search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
i
t-checkout
.
t
xt: clarify that <bra
n
ch> a
p
plies w
h
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
it-
c
hec
k
out
.
txt:
f
ix incorrect statement about HE
A
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Julie
n
Da
n
jou
git
s
ubmodule: fix usage line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Ju
n
io C H
a
mano
Mer
g
e b
r
anch 'ma
i
nt-1
.
6
.
1' int
o
main
t
commit
|
commitdiff
|
tree
2009-04-05
Junio C Haman
o
Merge br
a
nch
'
maint-1
.
6
.
0
'
into
m
a
int
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
M
a
rkus Heide
l
b
e
r
g
doc/git-pack-refs:
f
i
x two gramm
a
r issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: abort co
m
mit i
f
interactive add
f
ailed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
lem
e
ns
Bucha
c
h
er
sim
p
lify
o
utput of conf
l
icting merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchache
r
u
pdate cache for conflicting su
b
module entri
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
l
e
m
ens
Bu
c
hache
r
a
d
d tests fo
r
merging
w
ith submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next