repo.or.cz
/
git
/
mingw
/
4msysgit.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 Olsze
w
s
ki
me
r
ge-recursive
:
never l
e
ave index unmerged w
h
il
e
recursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C Hamano
GIT 1
.
6
.
2
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
erge
b
ranch '
n
p/maint-n
o
-ofs-d
e
lta' into maint
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
M
e
rge
bra
n
ch 'maint-1
.
6
.
1' i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
GIT 1
.
6
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Juni
o
C Hamano
Mer
g
e bran
c
h 'jc/maint-read-t
r
ee-mult
i
' into main
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ha
m
ano
Mer
g
e bra
n
ch 'mk/mai
n
t-apply-swap' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Hamano
Merg
e
branch 'mm/maint-add-p
-
q
uit' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Haman
o
Merge branch 'lt/pack-
o
bjec
t
-memu
s
e'
i
nto maint
commit
|
commitdiff
|
tree
2009-05-03
Jun
i
o C Hamano
Merge branch 'j
c
/maint-1
.
6
.
0
-
keep-
p
ack
'
into ma
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
amano
Merge branch 'jc/maint-1
.
6
.
0-diff-bo
r
r
o
w-ca
r
efully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
unio C Hama
n
o
Merge branch 'bs
/
ma
i
n
t
-1
.
6
.
0-tree-walk-prefix'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Nicolas Pitre
hon
o
r repac
k
.
used
e
ltabaseo
f
fs
e
t when fetching 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 Hamano
Merge bran
c
h
'maint-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
d
iff -
c
-
p
: do not
die
on
s
ubmodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Junio C
H
amano
Merge branc
h
'maint-1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
2009-04-28
Junio C H
a
ma
n
o
Merge b
r
anch 'maint-1
.
6
.
0' into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-28
Linus
T
o
r
valds
grep:
fix
s
e
g
fault wh
e
n
"
git g
r
ep '('" is given
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
Allan Caff
e
e
Documentation: fix a
grammati
c
al error
i
n
api-builtin
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
Allan Caff
e
e
builtin-m
e
rge: fix a ty
p
o i
n
a
n
e
r
ror m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Merg
e
branch '
m
aint-1
.
6
.
1
' int
o
maint
commit
|
commitdiff
|
tree
2009-04-25
Ju
n
io C Ha
m
ano
M
e
rge branch 'maint
-
1
.
6
.
0' into maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
St
e
phen
B
oyd
t
est-g
e
nrandom: Ad
d
n
ewline
t
o usage string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedrowicz
te
s
ts: m
a
ke t
e
st-appl
y
-c
r
i
s
s
-
c
ross-rename mo
r
e rob
u
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
M
i
chał Kiedrowicz
bu
i
l
t
i
n-app
l
y: keep infor
m
a
tion abou
t
f
i
les to be deleted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedrowicz
te
s
t
s: test
a
p
plying criss-cross
r
en
a
me pat
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Frank Lichtenheld
gitcvs-migration
:
L
i
nk to
g
it-cvsimport documen
t
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Johannes
Schindelin
Fix off-by-on
e
i
n
read_tree_recur
s
ive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
checkout branch: p
r
i
me cache-tree fully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
J
un
i
o C Hamano
r
e
ad-tree
-
m
A B: pr
i
me cache-tree f
r
om the swi
t
ched
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
J
uni
o
C Hamano
M
ov
e
prime_cache
_
t
ree() to cache-tree
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C
Ha
m
ano
read-tree A B
:
do not corru
p
t
c
a
che-
t
ree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Wincent C
o
laiuta
git add -p: add missing
"
q" to patch
promp
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
GI
T
1
.
6
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Nguyễn T
h
ái N
g
ọc Duy
Makefi
l
e: remove
{fetch,send}-pa
c
k from PROGRAMS as
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Junio C Ha
m
ano
Merge branch 'e
f
/maint-fast
-
export' into
maint
commit
|
commitdiff
|
tree
2009-04-19
Junio C Hamano
Mer
g
e branch 'mm/maint-add-p-quit' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-19
J
u
nio C Hamano
M
erge bran
c
h
'
lt/maint-reflog-expire' into mai
n
t
commit
|
commitdiff
|
tree
2009-04-19
J
u
nio C Hamano
Merge branch '
j
c/maint-shared-
l
iter
a
lly'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
Update git-add
.
t
x
t acco
r
ding to the
ne
w
possibiliti
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Jeff King
add-interacti
v
e: re
f
a
c
tor mode hunk handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
M
a
t
thieu M
o
y
git add
-
p:
n
ew "q
u
i
t
" command at
t
h
e prompt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Junio Ham
a
no
Speed
up reflog pruning of unreachable c
o
mm
i
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Linus T
o
rvalds
Cl
e
an
u
p
r
eflog unreac
h
ability pruning d
e
cision
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
E
r
i
k
Faye-Lund
b
uilt
i
n-fast
-
expo
r
t
.
c
:
hand
l
e nested tags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
E
rik Faye-
L
und
bu
i
lt
i
n
-
f
ast-export
.
c: fi
x
crash
o
n tagged tre
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Erik Fay
e
-Lund
b
u
i
lti
n
-fast-export
.
c:
turn error into warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Erik F
a
y
e
-Lund
test-suite
:
addin
g
a test
f
o
r
fast-expo
r
t
wi
t
h tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Jun
i
o
C
H
a
mano
Descr
i
be fix
e
s
s
ince 1
.
6
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merge
b
ranch 'ma
i
nt-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-18
Junio C
Ham
a
no
Merge branch 'mai
n
t-1
.
6
.
0' in
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Junio C Ha
m
an
o
M
e
r
g
e
b
ranch 'bs/
m
aint-1
.
6
.
0-tree-wa
l
k-prefix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Junio C Ha
m
ano
M
erge br
a
n
c
h 'js/maint-sub
m
odule
-
c
h
e
c
kout' into maint
commit
|
commitdiff
|
tree
2009-04-18
Juni
o
C Hamano
Merge b
r
an
c
h
'cb/maint-
m
erge-rec
u
rsive-submodule-fix
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
M
a
rkus Heidelberg
doc/git-daemon:
a
d
d missin
g
arguments to ma
x
-
connec
t
ions
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hama
n
o
M
e
rge
bran
c
h '
m
aint-1
.
6
.
0' into main
t
commit
|
commitdiff
|
tree
2009-04-18
Ma
r
kus
Heidelberg
doc/git
-
daem
o
n: add
missing
arguments to options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Frank Lic
h
tenhe
l
d
init:
Do not segfault on big
G
IT_
T
E
MPLATE_DI
R
environme
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Pau
l
Bolle
i
m
a
p-
s
end:
u
s
e
correct config
u
ration variable in documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Johan Herland
Update d
o
cs
on
beha
v
i
o
ur of 'core
.
sharedRepository
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/gi
t
attributes: clarify lo
c
a
t
ion o
f
config text
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Junio C
H
amano
Merg
e
b
r
anch '
m
ain
t
-1
.
6
.
1
'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-18
J
u
nio C
Hamano
Merge branch 'm
a
int-1
.
6
.
0' into
m
a
in
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Thom
a
s Jarosch
Fi
x
buff
e
r over
f
low in config parse
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-16
Ulrich Windl
git
-
apply: fix option description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-13
Linus Torvalds
sh
o
w_object(
)
:
push
p
ath_name() call f
u
rther down
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-13
Linus Torvalds
proces
s
_
{tree,bl
o
b
}:
s
how obje
c
ts without buffer
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
Junio C
Hamano
G
IT
1
.
6
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
J
unio C
Hama
n
o
Merg
e
br
a
nch 'maint-
1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-04-12
Jun
i
o C Haman
o
Mer
g
e
branch 'maint-1
.
6
.
0' i
n
t
o
main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-12
D
aniel Che
n
g (aka
.
.
.
State the eff
e
ct of filter-branc
h
on graft explicitly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
Linus Torva
l
ds
p
ro
c
ess_{tree,bl
o
b
}
: Remove use
l
ess xstrdup calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
Johannes S
i
xt
t1301-shared-
r
e
po:
f
ix force
d
modes t
e
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ham
a
no
Start 1
.
6
.
2
.
3
preparation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge branch 'jc/
s
hared-lit
e
rally'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-04-09
Jun
i
o C Hamano
Merge branch 'jc/main
t
-
1
.
6
.
0-diff-borrow-care
f
ully
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge branch 'ma
i
nt-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge bran
c
h 'ma
i
n
t
-
1
.
6
.
0'
i
n
t
o maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
J
uni
o
C Hamano
Me
r
g
e
branch 'jc/ma
i
nt-
1
.
6
.
0-k
e
ep
-
p
ack' in
t
o m
a
int
commit
|
commitdiff
|
tree
2009-04-09
Juni
o
C Ham
a
no
Merge branc
h
'jc/maint-1
.
6
.
0-blame-s' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
J
u
nio C
Hamano
Merge branch 'bc/main
t
-1
.
6
.
1-
b
r
anch-delete
d
-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio
C
Hama
n
o
M
erge branch 'js/
m
aint-1
.
6
.
0
-exec-
p
ath-env'
into m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
J
un
i
o C Hama
n
o
Merge bra
n
c
h
'tr/
m
a
i
nt-
1
.
6
.
1-
d
oc-for
m
at-patch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
B
jörn Steinbr
i
n
k
process_{tree,bl
o
b
}:
R
emove useless xstrdup calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-pul
l
.
sh: bet
t
er warnin
g
message for "git p
u
ll"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Jun
i
o C Ham
a
no
Merge bran
c
h 'm
a
i
n
t-1
.
6
.
1
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-04-08
Ja
r
i Aalt
o
Chang
e
double quot
e
s to sin
g
le quotes in
m
essage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Junio C
Ha
m
ano
Merge br
a
n
c
h 'maint-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
Ja
s
on Merrill
Docum
e
n
t
ation
:
clarify
.
g
itattributes se
a
rch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
atth
i
eu Moy
g
it-checkout
.
txt: cl
a
rify
that <bra
n
ch> applies when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
atth
i
eu Moy
git-checkout
.
txt: fix incorr
e
ct statemen
t
about HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjo
u
git sub
m
o
d
u
le: fi
x
usage
l
i
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
unio C Haman
o
M
e
rge
b
ran
c
h
'm
a
i
n
t-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge b
r
anch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Ma
r
kus
Heid
e
lbe
r
g
doc/g
i
t
-
pack-refs: fix tw
o
grammar issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
c
ommit:
a
bort comm
i
t if i
n
teractive add failed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Bucha
c
her
simplify output of confl
i
cting
mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buch
a
c
her
update cache fo
r
conflicting subm
o
dule
e
ntries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
ad
d
t
ests for
merging with su
b
modules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next