repo.or.cz
/
git
/
vmiklos.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
D
a
ve Olszewski
merge
-
recursive: never lea
v
e inde
x
unmerged while
r
ecursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C Hama
n
o
GIT
1
.
6
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
e
r
g
e branc
h
'np/
m
ain
t
-no-ofs-de
l
ta' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ha
m
ano
Merge
b
ranch
'
m
aint-1
.
6
.
1
'
i
n
to main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
G
IT 1
.
6
.
1
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
erge bra
n
ch 'jc/mai
n
t-rea
d
-
t
re
e
-multi'
i
n
to maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio C Ha
m
a
n
o
Merg
e
b
r
anch 'mk/
m
ai
n
t-apply-swa
p
' into
maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Hama
n
o
Me
r
ge br
a
nch
'mm/maint-add-p-quit' int
o
maint
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o
C Ha
m
ano
Merge bran
c
h '
l
t/pack-ob
j
ect-memu
s
e
'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o
C Hamano
Mer
g
e
b
ra
n
ch 'jc/maint-1
.
6
.
0-keep-pa
c
k' i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch 'jc/mai
n
t-1
.
6
.
0-diff-borrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
unio
C
H
aman
o
M
erge branc
h
'bs/maint-1
.
6
.
0
-
tree-w
a
lk-pre
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Nicolas Pitre
honor repack
.
usede
l
tabaseo
f
fset when fetching packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
Merge bran
c
h 'main
t
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-29
Junio C
H
amano
Merge branch
'
maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio C Haman
o
di
f
f
-
c -p: do not die on s
u
bmodul
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Merge branch 'main
t
-1
.
6
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2009-04-28
Junio C Haman
o
M
erge bran
c
h
'
maint-
1
.
6
.
0' into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-28
Linus T
o
rv
a
l
d
s
grep: fi
x
seg
f
ault wh
e
n "git
g
rep '('"
is giv
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Allan
C
af
f
e
e
Docu
m
en
t
ation: fix a g
r
a
mmatical error in api-builtin
.
t
x
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Allan
Caffee
builti
n
-me
r
ge: fix a typo in an er
r
o
r message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Merge
b
ranch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-25
Ju
n
io
C Hamano
Me
r
ge branch 'maint-1
.
6
.
0' into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Step
h
en Boyd
test
-
genrand
o
m: Add newli
n
e
t
o us
a
ge
s
tring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedr
o
w
i
c
z
te
s
ts:
m
ake test-apply-c
r
iss-cross-r
e
n
ame more robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał
K
iedrowic
z
builtin-apply:
keep information a
b
out
f
iles to be
deleted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał
Kiedrowicz
tests: test
a
pply
i
ng cri
s
s-cross rename patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Fr
a
nk Lichtenheld
gitcvs-m
i
gration:
L
i
n
k to git-cvsimport do
c
umentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Joh
a
nnes Schindelin
Fix off-by-one in
r
ead_tree_recurs
i
ve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
Haman
o
checkout br
a
nch: pri
m
e cache-tree f
u
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C
Hamano
read-tree -m
A
B
:
prime
cache
-
t
ree from the swit
c
hed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
u
nio C Hamano
Move prime_cache_tree() to cache-t
r
ee
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Haman
o
r
ead
-
t
r
ee
A B: do n
o
t corrupt
c
ache-tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Wincent Colaiuta
git add -p: add miss
i
ng "q" to
patc
h
prom
p
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
u
nio
C Ha
m
a
n
o
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 Duy
Mak
e
file: remove {fetch,send}-pack from
P
R
OGRA
M
S as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Junio C Hamano
M
erge b
r
anch 'ef/maint-fast-exp
o
rt' into maint
commit
|
commitdiff
|
tree
2009-04-19
Junio C Hamano
Merge bran
c
h 'mm/ma
i
nt-add-p-quit' into
maint
commit
|
commitdiff
|
tree
2009-04-19
J
u
nio C Ham
a
n
o
Merg
e
bra
n
ch 'lt/ma
i
nt-reflog-e
x
p
i
r
e' into
m
aint
commit
|
commitdiff
|
tree
2009-04-19
Jun
i
o C H
a
mano
Merge
b
ranc
h
'jc/maint-shared-
l
iterally' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Mo
y
Update
g
it-add
.
txt
a
ccording to th
e
new p
o
ssibiliti
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Je
f
f King
add-intera
c
t
ive: refac
t
or
m
ode hunk handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
git add -p: new "quit"
c
ommand at the prompt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Junio
Ham
a
n
o
Sp
e
ed up reflog
p
runi
n
g o
f
unreach
a
ble
c
o
m
mits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Li
n
u
s
Torvalds
Clean up reflog unreachab
i
l
i
ty pruni
n
g decision
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
E
r
i
k Faye-Lund
builtin-fast-export
.
c: h
a
ndl
e
nested ta
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Er
i
k Fa
y
e-Lund
b
uil
t
in-fa
s
t-export
.
c: fix crash on
tagged trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye-Lund
builti
n
-fast
-
export
.
c: turn err
o
r into warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
E
r
ik Faye
-
Lund
t
e
st
-
suit
e
: adding
a
te
s
t for fast-exp
o
rt with tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
J
unio C Ha
m
a
no
De
s
cribe fi
x
es
since 1
.
6
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Jun
i
o C Hamano
Me
r
ge branch 'maint-1
.
6
.
1' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merg
e
branch 'm
a
int
-
1
.
6
.
0' i
n
to
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
M
e
rge b
r
anch '
b
s
/
m
a
i
nt-1
.
6
.
0-
t
ree-walk-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Junio C
Hama
n
o
Merge bran
c
h 'js/m
a
i
nt-submodule
-
checkout' into
m
aint
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merge b
r
anch 'cb/mai
n
t-merge-recursive-s
u
bmodule-
f
ix
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Markus Heidelberg
doc/
g
it-da
e
mo
n
:
add
m
i
s
s
i
ng arguments to max-
c
o
n
n
ect
i
ons
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
J
u
nio
C
Hamano
Merg
e
branch 'maint-1
.
6
.
0' into
m
aint
commit
|
commitdiff
|
tree
2009-04-18
Markus Heidelberg
doc
/
git-da
e
mon: add
missing arguments to optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
F
ra
n
k Lichte
n
h
e
l
d
init: Do not segfaul
t
o
n big GIT_
T
E
MPLATE_DIR
e
n
viro
n
ment
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Paul Bolle
imap-send: use correc
t
config
u
ratio
n
variab
l
e i
n
documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Update docs on be
h
a
viou
r
of 'cor
e
.
s
haredRepositor
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
J
e
ff Kin
g
doc/gitat
t
ributes: clarify location
of config
text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merge branch
'
maint
-
1
.
6
.
1' into mai
n
t
commit
|
commitdiff
|
tree
2009-04-18
Junio C
Hamano
Merg
e
bra
n
ch 'main
t
-1
.
6
.
0'
i
nto maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Thomas Jarosch
Fix buffer o
v
e
r
f
low in confi
g
par
s
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-16
Ulr
i
ch Windl
git-apply:
f
ix
o
ption
d
escript
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
L
i
n
u
s
Torvald
s
show_o
b
ject(): push path_n
a
me
(
) call further down
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Linus T
o
rvald
s
proce
s
s_{tree,blob}: s
h
ow objects without buf
f
ering
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Jun
i
o C
H
a
m
ano
GIT 1
.
6
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
Merge bran
c
h 'maint-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
Merg
e
b
r
anch 'maint-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-12
Daniel Cheng (a
k
a
.
.
.
State the effec
t
of filter-branch
on graft explicit
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Linu
s
Torvald
s
process_{tr
e
e
,blob}:
R
emove useless xstrdup calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
J
o
hannes Sixt
t1301-s
h
ared-repo
:
fix forced
m
odes test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
J
u
nio C Hamano
Start 1
.
6
.
2
.
3
p
r
e
par
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio C
Hamano
M
e
r
g
e branch 'j
c
/shared-li
t
erally' into maint
commit
|
commitdiff
|
tree
2009-04-09
Junio C
H
amano
Merge branch
'
jc/main
t
-1
.
6
.
0-diff-borrow-ca
r
efully
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Haman
o
Merge branc
h
'ma
i
n
t-
1
.
6
.
1'
int
o
maint
commit
|
commitdiff
|
tree
2009-04-09
Junio
C Ha
m
ano
Merge bran
c
h 'mai
n
t
-
1
.
6
.
0' i
n
t
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge branch '
j
c
/
maint-1
.
6
.
0
-
kee
p
-pack'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-04-09
Junio C
Hamano
Merge branc
h
'jc/main
t
-1
.
6
.
0-b
l
a
m
e-s' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
J
un
i
o C Hamano
Merge branc
h
'bc/ma
i
nt-1
.
6
.
1
-branch-deleted
-
w
a
s' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
J
u
ni
o
C Ham
a
no
Merge branch 'js/mai
n
t-1
.
6
.
0-exec-path-
e
nv
'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
J
u
nio C Ham
a
no
Merge branch 'tr
/
maint-1
.
6
.
1-doc-form
a
t
-
p
at
c
h--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Björn S
t
einbrink
process
_
{tr
e
e,blob}: Remo
v
e u
s
eless xstrd
u
p calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu M
o
y
git-p
u
ll
.
sh: better warning m
e
ssa
g
e for "git pul
l
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio C H
a
mano
Merge branch 'maint-
1
.
6
.
1'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-08
Jari
A
a
l
to
C
hange
double quotes to single quotes in me
s
s
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
Mer
g
e
b
ra
n
ch 'main
t
-
1
.
6
.
0
'
in
t
o
maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
Jason Merrill
Docume
n
tatio
n
: clarify
.
gitattribut
e
s
s
earch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu M
o
y
git-chec
k
out
.
txt:
cla
r
ify that <branc
h
>
app
l
i
es when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
t
hieu Moy
git-checkout
.
txt: fi
x
incorrect
s
ta
t
e
m
ent ab
o
u
t HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjou
g
i
t submodule: fix usage line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ham
a
no
Merge branch 'ma
i
nt-1
.
6
.
1'
into main
t
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ham
a
no
Merge
branch
'
maint-1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Marku
s
Heidelbe
r
g
doc/git-pa
c
k
-refs: fix two grammar
i
s
sues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff Ki
n
g
commi
t
: abort comm
i
t if interactive add failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buc
h
acher
simplify outp
u
t
of conflicting merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemen
s
B
uch
a
cher
update cache
fo
r
conflicting submod
u
le en
t
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Cleme
n
s Buchacher
a
d
d tests
f
or merging
w
i
t
h submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next