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 Olszewski
merge
-
r
e
cursive
:
n
e
v
e
r
leave index unmerged while
r
e
cursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
Junio 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
ge
br
a
n
ch 'np/main
t
-no-ofs-delta' into maint
commit
|
commitdiff
|
tree
2009-05-03
J
u
n
io C
H
a
mano
M
e
rge br
a
nch
'maint-
1
.
6
.
1
'
into
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
Jun
i
o C Hamano
Me
r
g
e
branc
h
'j
c
/maint-rea
d
-tre
e
-m
u
lti' into mai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Me
r
ge branch 'mk/mai
n
t-apply-swap'
into main
t
commit
|
commitdiff
|
tree
2009-05-03
J
u
ni
o
C Hama
n
o
Merge
b
r
a
nch 'm
m
/mai
n
t-add-p-quit' into maint
commit
|
commitdiff
|
tree
2009-05-03
J
unio
C
Hamano
Merge branch
'lt/pack-
o
bject-m
e
muse' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2009-05-03
J
u
n
io
C Hamano
Merge
bran
c
h
'jc/maint-1
.
6
.
0-keep-pack' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
no
Merge branch 'jc/maint-1
.
6
.
0
-
diff-
b
o
rrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branch 'bs/
m
ai
n
t-1
.
6
.
0-tree-walk
-
prefix
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
N
i
co
l
as
Pitre
honor
repack
.
usedel
t
abaseo
f
fset when fetching pa
c
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Ju
n
io C Hamano
M
erge br
a
nch 'mai
n
t-1
.
6
.
1' into
maint
commit
|
commitdiff
|
tree
2009-04-29
Juni
o
C
Hamano
Merge b
r
a
n
ch 'mai
n
t-1
.
6
.
0
'
int
o
m
a
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
diff -c -p:
do not die
o
n submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
M
e
rge b
r
anc
h
'mai
n
t-1
.
6
.
1' into
maint
commit
|
commitdiff
|
tree
2009-04-28
Juni
o
C Haman
o
Me
r
g
e bra
n
ch
'
maint-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-28
L
i
nus
Torvalds
grep: fix se
g
faul
t
when "git grep '('"
is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Al
l
a
n
C
affee
Documenta
t
ion: fix a gra
m
matical error in api-b
u
ilti
n
.
t
x
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Allan Caffe
e
b
uiltin-merge: fix a typo in
an
e
r
ror mess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Jun
i
o C Hamano
Merge branch 'main
t
-1
.
6
.
1'
into mai
n
t
commit
|
commitdiff
|
tree
2009-04-25
J
unio C Ham
a
no
Mer
g
e bran
c
h
'mai
n
t-1
.
6
.
0
' i
n
to
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
S
t
ephen Boyd
t
est-
g
e
nrandom
:
A
d
d ne
w
line to usage string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał K
i
e
drowicz
tests
:
make
test-apply-criss-cro
s
s-ren
a
me m
o
re r
o
bust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Mic
h
ał
K
iedrowicz
buil
t
in
-
apply: keep
i
nfor
m
at
i
on about files
to b
e
delete
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Mic
h
ał Kiedrowicz
t
e
s
t
s: test ap
p
lying criss
-
cr
o
ss rename
patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Frank Lichtenheld
gitcvs-migr
a
tion: Link to git-cvsimp
o
rt documentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
oh
a
nn
e
s Schindelin
Fix off-by-one in read_tree_recu
r
sive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
u
n
io C Hamano
checkout
b
r
a
nch:
p
rime cache-tree fully
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Haman
o
read-tree -m
A B: prime cach
e
-tree fr
o
m the switche
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
unio
C Hamano
Move prime_cache_
t
ree() to cach
e
-tre
e
.
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:
d
o no
t
corrupt cach
e
-t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Wincent Cola
i
uta
git add -p
:
a
d
d
m
issing
"q" to
patch prompt
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
Duy
Ma
k
efile: remove {fetch,send}
-
p
a
ck
f
rom PROGR
A
M
S
as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Junio C H
a
mano
Me
r
ge branch 'ef/maint-f
a
st-
e
x
p
o
r
t' int
o
maint
commit
|
commitdiff
|
tree
2009-04-19
J
u
nio
C
H
amano
Merge br
a
nch 'mm/main
t
-
add-p-
q
u
it
'
into maint
commit
|
commitdiff
|
tree
2009-04-19
Junio C Hamano
Merge branc
h
'l
t
/
m
a
int-reflog-expire
'
into maint
commit
|
commitdiff
|
tree
2009-04-19
Junio C
Hamano
M
erge branch
'
jc
/
maint-shared
-
l
i
t
e
rally' into
maint
commit
|
commitdiff
|
tree
2009-04-19
M
a
tthieu Moy
Upda
t
e
git-a
d
d
.
txt accord
i
ng to the
n
ew possibilities
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Jeff King
add-
i
n
t
erac
t
ive: re
f
actor mode hun
k
h
a
ndling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Matt
h
ie
u
Moy
git add -p: new
"qu
i
t" co
m
mand a
t
the prompt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Jun
i
o Hamano
Speed up reflog pruning
o
f unreachable commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Linu
s
Torvalds
C
l
e
a
n up reflog
unreachability pruning
d
ecision
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik
F
aye
-
Lun
d
builtin-fast-export
.
c: handle
nested tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
E
rik
Faye-
L
und
builtin-f
a
st-export
.
c:
fix cras
h
on
ta
g
ge
d
trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik
Faye-
L
und
builtin-fast-
e
x
por
t
.
c
: turn error
in
t
o warni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye-Lund
t
e
st-
s
u
i
te: addin
g
a te
s
t for fast-export wi
t
h ta
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
J
uni
o
C
Hamano
De
s
crib
e
fixes since
1
.
6
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Mer
g
e
branch
'
m
ain
t
-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-18
Junio C
H
am
a
no
M
e
rge b
r
a
n
ch
'maint-1
.
6
.
0' in
t
o
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Junio C
Hamano
Merge b
r
anch 'bs/maint-1
.
6
.
0-tree-wa
l
k-prefi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Junio
C
H
amano
Merge branch 'js/maint-submodule-chec
k
o
u
t' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-18
Ju
n
io C Hamano
Merge
b
ranch 'cb/ma
i
n
t
-m
e
rge
-
recursive-s
u
bm
o
dule
-
fix
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Markus Heidelber
g
doc/g
i
t-daemon: add mi
s
sing
a
rguments to max-
c
onnections
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Mer
g
e b
r
a
n
ch
'
maint-1
.
6
.
0' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-18
Mar
k
u
s H
e
idelberg
d
oc/git-da
e
m
o
n: add mi
s
sing argume
n
ts to
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Frank Lichtenheld
i
n
it: D
o
not segfault on big GIT_T
E
M
P
LATE_DIR envir
o
nment
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
P
a
ul Bolle
imap-sen
d
: use correc
t
conf
i
g
u
r
ati
o
n variable in documentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
J
o
h
an H
e
rland
U
p
date d
o
cs o
n
b
e
ha
v
iour of 'co
r
e
.
s
ha
r
edRepository
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
d
oc/git
a
ttributes:
c
larify lo
c
ation of c
o
nfig text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio C
Hamano
Merg
e
br
a
nch '
m
aint
-
1
.
6
.
1' int
o
maint
commit
|
commitdiff
|
tree
2009-04-18
Junio C Ha
m
ano
M
er
g
e branc
h
'ma
i
nt-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Th
o
mas Jaro
s
ch
Fix b
u
ff
e
r overflow
i
n
config parser
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-16
Ulr
i
ch Windl
g
i
t
-
apply: fix option description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
L
i
n
us
Torvalds
sho
w
_object(
)
: push
p
ath_name() call further down
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Linus
Tor
v
a
lds
process_{tree,blob}:
s
how objects without b
u
ff
e
ring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Juni
o
C Hamano
G
I
T
1
.
6
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
M
e
r
ge branch 'maint-1
.
6
.
1' into main
t
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
Mer
g
e b
r
an
c
h 'main
t
-1
.
6
.
0
' int
o
mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-12
Daniel Cheng
(
aka
.
.
.
S
t
at
e
the effect of filter-branch on graft explicitly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Linus Torvalds
p
rocess_{tr
e
e,blob}: Remove useless xstrd
u
p
c
alls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Jo
h
annes Sixt
t1301-share
d
-repo:
f
ix forc
e
d modes test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio
C Hamano
Start 1
.
6
.
2
.
3 p
r
eparation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Jun
i
o C Ham
a
n
o
Merge branch 'jc/
s
hared-litera
l
l
y
' into
m
aint
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ham
a
no
Merge branch
'
jc/maint-1
.
6
.
0-diff-
b
or
r
ow-car
e
fu
l
ly
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Juni
o
C Hamano
Me
r
ge b
r
a
n
ch 'm
a
in
t
-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ham
a
no
Mer
g
e br
a
nch 'ma
i
nt-
1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Juni
o
C Hamano
Merge branc
h
'jc/maint-1
.
6
.
0-keep-pack' into maint
commit
|
commitdiff
|
tree
2009-04-09
Junio C
H
ama
n
o
Merge bran
c
h 'jc/maint-1
.
6
.
0-blame-s
'
into
m
a
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge branch
'
bc/m
a
int-1
.
6
.
1-branch-
d
eleted-was
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C H
a
mano
Merg
e
br
a
nc
h
'js/
m
aint-1
.
6
.
0-
e
xec-path
-
e
nv' in
t
o
m
ain
t
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge b
r
anch 'tr/main
t
-1
.
6
.
1
-
d
oc-format-
p
atc
h
--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Björn Steinbrink
process_{tree
,
b
l
o
b}: R
e
m
o
ve useless x
s
trdup calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matt
h
ie
u
Mo
y
git-pull
.
sh:
b
e
tter warning message for "git pul
l
"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio C
H
amano
Merge branch 'maint-1
.
6
.
1'
into mai
n
t
commit
|
commitdiff
|
tree
2009-04-08
Jari
Aalto
Change double quote
s
to single quot
e
s
in mess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio C Ha
m
ano
Mer
g
e branch 'main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
Jason
M
err
i
ll
Docume
n
tation: clarify
.
gita
t
tributes search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-chec
k
out
.
txt: clarify that <branch> app
l
ies w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu Moy
git-
c
heckout
.
txt:
f
ix incorrect stat
e
ment about HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
u
l
ien D
a
nj
o
u
git submodule:
fix us
a
g
e
line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jun
i
o C Hama
n
o
M
erge
branch 'mai
n
t-1
.
6
.
1
'
into maint
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ha
m
a
n
o
Me
r
ge br
a
n
ch 'main
t
-1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelberg
doc/g
i
t-pack-
r
e
fs: fix
t
wo gramm
a
r is
s
ues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jef
f
King
commit: abort comm
i
t if interactive add fa
i
led
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Cl
e
m
e
ns Buchac
h
er
simplify output of conflicting
m
e
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buc
h
acher
upda
t
e cache
for con
f
lict
i
ng submodul
e
entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens
B
uchacher
a
dd tests for merging with
s
ubmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next