repo.or.cz
/
git
/
mjg.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-recursive:
n
ever leave index unmerg
e
d
while recurs
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
GIT
1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branc
h
'
np/maint-n
o
-o
f
s-del
t
a' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ha
m
ano
Merge branch '
m
aint-1
.
6
.
1'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
no
GIT 1
.
6
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
H
ama
n
o
Merge bra
n
c
h
'
jc/maint-read-tree-multi' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge
branch 'mk/mai
n
t
-
apply-swap
'
into m
a
int
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C
Hamano
Merge branc
h
'mm/main
t
-add-
p
-
q
uit' into ma
i
nt
commit
|
commitdiff
|
tree
2009-05-03
J
un
i
o C Hamano
Merge branch 'lt/pack-object-m
e
m
u
s
e' in
t
o maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Hamano
M
e
rge branch 'jc
/
maint-1
.
6
.
0-keep-p
a
ck' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
mano
Merg
e
branc
h
'jc/main
t
-1
.
6
.
0-diff-
b
orrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch 'bs
/
maint-1
.
6
.
0-tree-w
a
l
k-prefix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Nicol
a
s Pit
r
e
h
onor repack
.
us
e
delt
a
baseoffse
t
when fetching packs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
Merge
b
ranch 'mai
n
t-1
.
6
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
M
e
rge branch 'maint-1
.
6
.
0'
into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Jun
i
o C
Ham
a
no
diff -c -p:
do n
o
t di
e
on
submodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-28
J
u
nio C Hama
n
o
M
e
rge branch 'main
t
-1
.
6
.
0'
into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-28
Lin
u
s Torva
l
ds
gr
e
p: f
i
x
s
e
gfault w
h
en "git grep '('" is given
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
Allan Caffee
Docu
m
e
n
t
a
ti
o
n: fix a
grammatical error in api-builtin
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
Allan Caffee
buil
t
in-
m
e
rge: f
i
x a typo in
a
n error me
s
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Junio C
Hama
n
o
Merge branch 'maint-1
.
6
.
1'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-04-25
Juni
o
C Haman
o
Mer
g
e branch 'ma
i
nt-1
.
6
.
0' into
ma
i
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
St
e
phe
n
B
o
yd
test-genra
n
dom: Add newline to usage string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Mic
h
a
ł Kiedrowicz
tests: make test-ap
p
ly-criss-cross-re
n
ame more rob
u
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Mic
h
ał Kie
d
r
owi
c
z
buil
t
in-a
p
p
l
y
:
keep information
about fil
e
s to be
d
ele
t
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedrowi
c
z
tests: test applying criss-cross rename patch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
F
rank Lich
t
enh
e
ld
g
i
tcvs-mi
g
ratio
n
: Li
n
k
to git-cvsimport documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Joh
a
nn
e
s Schindelin
Fix off-
b
y
-one in
read_tree_recursive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C
Hamano
checko
u
t br
a
nch: prime cache
-
t
ree fully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hama
n
o
read-
t
ree -m
A
B: prime cache-tree from the switched
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
M
o
ve
pr
i
me_cache_tree() to cache-tree
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
read-tre
e
A
B: do not co
r
rupt cach
e
-
t
re
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
W
incent Colaiut
a
git add -p: add mi
s
sing
"q" to patch prompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
J
unio C Hamano
GI
T
1
.
6
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Ng
u
yễn
Thái
Ngọc Duy
M
akefile:
r
emove {
f
etch,s
e
nd
}
-pack
from PROGRA
M
S
a
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Junio C Hamano
M
e
rge br
a
nch 'ef/maint-
f
a
st-export
'
into maint
commit
|
commitdiff
|
tree
2009-04-19
J
unio C
Hamano
M
e
rge b
r
a
n
ch 'm
m
/main
t
-
a
dd-p-quit' into maint
commit
|
commitdiff
|
tree
2009-04-19
Junio
C
Hamano
Merg
e
bra
n
ch 'lt/
m
aint-r
e
flog-expire'
int
o
maint
commit
|
commitdiff
|
tree
2009-04-19
Junio C
Hamano
Merge bra
n
ch
'
jc/maint
-
shared-literally' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
Update git-add
.
txt according
t
o
the new poss
i
bilities
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
J
eff Kin
g
add-interactive: refact
o
r mode hun
k
han
d
ling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu
M
o
y
git add -p: new
"
quit" c
o
mmand
at the pr
o
m
pt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Ju
n
io Hamano
Speed up reflog pruning o
f
unreachabl
e
commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Linus Torvald
s
Clean u
p
reflog unreac
h
a
b
ility pruning decisi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
E
rik
F
aye-Lund
b
u
iltin-fast-
e
xpor
t
.
c: handle nested tags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Erik Fay
e
-Lund
builtin-fast-export
.
c: fix cr
a
s
h on tagged trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye-Lund
builtin-
f
a
st-export
.
c: t
u
rn error into w
a
rn
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
E
r
ik Faye-Lund
test-suit
e
: adding
a test for fast
-
export
w
ith
t
ag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Ham
a
no
Describe
f
ixes since 1
.
6
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Junio C H
a
mano
Merge bra
n
ch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
M
e
rge bra
n
ch 'mai
n
t-1
.
6
.
0'
i
nto
m
ai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
J
u
nio C Ha
m
a
n
o
Merge branch 'bs/ma
i
nt-
1
.
6
.
0-
t
ree-walk-prefix
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
J
u
nio
C
Ham
a
no
Merge
b
r
anch '
j
s/maint-submodule
-
checkout' in
t
o
ma
i
n
t
commit
|
commitdiff
|
tree
2009-04-18
Junio C
Hamano
Merge
b
ranc
h
'cb/maint-mer
g
e-recursive-submo
d
u
l
e-fix
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Markus H
e
idelberg
doc
/
git
-
daemon: add
m
issin
g
arg
u
ments to max
-
connections
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Ha
m
an
o
Merg
e
branch 'maint
-
1
.
6
.
0' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-18
Ma
r
k
u
s He
i
delberg
d
o
c/git
-
daem
o
n:
add missing arg
u
ment
s
to
o
ptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Frank
L
ic
h
tenhe
l
d
init: Do not segfault on big GIT_T
E
MPLATE_DIR environment
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Paul Bol
l
e
i
m
a
p
-s
e
nd
:
use correct configurati
o
n variable in documenta
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Jo
h
an Herl
a
nd
U
p
date docs
o
n
behaviour
o
f 'core
.
sh
a
redReposit
o
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
J
eff Ki
n
g
doc/gita
t
tributes
:
c
larify location o
f
config
t
e
xt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Haman
o
Merge
b
ranch
'maint-1
.
6
.
1
'
i
n
t
o main
t
commit
|
commitdiff
|
tree
2009-04-18
Ju
n
io C
H
amano
Merge
b
ra
n
ch 'maint-
1
.
6
.
0
' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Thomas Jaro
s
c
h
Fix buffer
ove
r
flow in c
o
nfig par
s
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-16
Ulrich Windl
g
it-apply: fix optio
n
descri
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-13
Linus Torvalds
show_obj
e
ct(): p
u
sh p
a
th_name(
)
c
a
l
l
further down
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-13
Li
n
us T
o
rvalds
process_{tree,blob}:
show objects without
buffering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
J
u
nio C
H
a
m
a
n
o
GIT
1
.
6
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
Juni
o
C Ham
a
no
Merge bra
n
c
h 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-12
J
u
nio C
H
a
m
an
o
Merge
b
ranch
'
m
a
i
nt-1
.
6
.
0'
i
nto maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-12
Daniel Chen
g
(aka
.
.
.
S
t
ate the effect of filter-branch on graf
t
exp
l
ic
i
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
Li
n
u
s
T
or
v
alds
proc
e
ss_{tre
e
,b
l
ob}: Remove
useless xst
r
dup
c
a
l
l
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
Johannes
Sixt
t1301-shared-repo
:
fix forced modes tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-09
Junio C
H
ama
n
o
Start
1
.
6
.
2
.
3
p
reparatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge branc
h
'
j
c
/shared-literally' into
maint
commit
|
commitdiff
|
tree
2009-04-09
Ju
n
i
o C Hamano
Mer
g
e branch 'jc/maint
-
1
.
6
.
0-diff-borrow-
c
arefully
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C H
a
mano
M
erge branch 'maint-1
.
6
.
1'
into mai
n
t
commit
|
commitdiff
|
tree
2009-04-09
Junio
C
Haman
o
Merg
e
branch 'main
t
-1
.
6
.
0
'
into mai
n
t-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
J
unio C Hamano
Merge branch 'jc/maint-1
.
6
.
0-kee
p
-
p
a
c
k' into
maint
commit
|
commitdiff
|
tree
2009-04-09
J
unio
C Ha
m
ano
Merge b
r
anch 'jc/maint-1
.
6
.
0
-blame-s' into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
J
u
nio C H
a
man
o
Merge branch 'bc
/
m
a
int-1
.
6
.
1-branch-de
l
eted-was' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C H
a
m
a
no
Merge b
r
anch 'js/mai
n
t-1
.
6
.
0-exe
c
-path-e
n
v'
i
nto ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge
b
ranch 'tr/
m
aint-1
.
6
.
1-doc-format-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Björn Steinbrink
proce
s
s_{tree,blob}: Remove use
l
e
s
s xst
r
d
up calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu
Moy
g
it-pull
.
sh: bett
e
r warning me
s
sage f
o
r "g
i
t
p
ul
l
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Jun
i
o
C
Hamano
M
erge br
a
nch 'maint-1
.
6
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2009-04-08
Jari
A
alto
Change double quotes to single quote
s
i
n message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Junio C
H
amano
Merg
e
branc
h
'maint-1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
J
a
son
M
e
r
r
i
ll
Documen
t
a
t
ion:
cla
r
ify
.
gitattri
b
utes search
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
t
thieu
M
oy
git-ch
e
c
k
out
.
t
xt: clarify
t
hat <bra
n
ch> a
p
pli
e
s when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu
Moy
git-checkout
.
txt
:
fix incorrect statemen
t
about HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jul
i
en Da
n
jou
g
i
t submodule: fix
usage line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Ju
n
io C
H
amano
Merge branch 'maint-1
.
6
.
1
'
i
nto
maint
commit
|
commitdiff
|
tree
2009-04-05
Junio C
H
amano
Merge br
a
nch 'ma
i
nt-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelbe
r
g
d
o
c/git
-
pack-refs: fix two grammar issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Je
f
f King
commit: abort commit if inte
r
acti
v
e add fai
l
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
C
lemens Bucha
c
her
s
implify output o
f
conflicting
mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Cl
e
mens
B
uc
h
ache
r
update cache for confli
c
t
ing submodule en
t
ries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemen
s
Buchacher
a
dd tests for merg
i
ng with s
u
bmodul
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next