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 Olszewski
m
erge-recursive:
nev
e
r
l
eave
index unmerged while recursi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Hamano
GIT
1
.
6
.
2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C Hamano
Merge br
a
nch 'np/maint-no-ofs-delta'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio C H
a
ma
n
o
M
e
rge b
r
anch '
m
aint-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-05-03
Junio C
H
a
m
ano
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 Hamano
Merge
b
ra
n
ch 'jc
/
m
aint-re
a
d-tree-
m
u
l
ti' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
M
e
r
ge bran
c
h 'mk/maint-
a
pply-swap' into
maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Ha
m
ano
Merge b
r
anch
'
m
m
/ma
i
nt-add-p-q
u
it' into maint
commit
|
commitdiff
|
tree
2009-05-03
Ju
n
io C Hamano
Merge branch 'lt/pack-object-memuse' into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C
Hamano
Me
r
ge branch '
j
c/maint-1
.
6
.
0
-
k
e
e
p-pack'
i
nto
maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
J
u
nio C
H
a
mano
Merge b
r
anch
'
jc
/
maint-1
.
6
.
0-diff-b
o
rrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge b
r
a
n
ch 'bs/
m
aint
-
1
.
6
.
0-tree-wa
l
k-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
N
icola
s
Pit
r
e
h
onor re
p
ack
.
usedelta
b
a
s
eoffset when f
e
t
c
hing pa
c
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Juni
o
C Hamano
Me
r
ge
b
ranch 'maint-1
.
6
.
1
' i
n
to maint
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ham
a
no
Merge
b
ran
c
h '
m
aint
-
1
.
6
.
0' into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Ju
n
io C Ha
m
ano
d
i
f
f -c
-
p: do not die on s
u
b
m
o
d
u
l
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Junio C Ham
a
no
M
erge b
r
anch 'maint-1
.
6
.
1' into
maint
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
M
erge branch
'
maint-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-28
Linus Torvalds
grep: fix segfa
u
lt w
h
en "git gr
e
p '('" is
g
i
v
en
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
All
a
n
Caffee
Docum
e
ntat
i
o
n
: fix a gra
m
matical error in api-bu
i
ltin
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Allan Caffe
e
bui
l
t
i
n-merg
e
: fix a
typo in an error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Junio
C
Ham
a
no
Merge branch 'm
a
int-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-25
Junio C Haman
o
Me
r
ge branc
h
'maint
-
1
.
6
.
0' into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boyd
te
s
t-genrandom: Add newline
to usage strin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedro
w
i
cz
tests:
make test-apply-criss-cross-
r
ename mo
r
e r
o
b
u
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedrowicz
builtin-apply: keep
i
nforma
t
ion about files to be deleted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedrowicz
test
s
: test applying criss-cr
o
ss re
n
a
me patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Frank
L
ichtenheld
gitc
v
s
-
migratio
n
:
Link to git-cvsimport
d
ocu
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Johannes Sch
i
ndelin
Fix off-
b
y-one in read_t
r
ee_rec
u
rs
i
ve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Hamano
checkout bran
c
h: pri
m
e c
a
che-
t
ree
fu
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Juni
o
C Hamano
read-tre
e
-m A B: prim
e
cach
e
-tree from the switched
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C H
a
mano
Move prime
_
cache_tree(
)
to cache-tr
e
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
unio C
H
amano
read-t
r
ee A B: do no
t
corrupt ca
c
he-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
W
i
ncent Colaiuta
g
it add -p
:
add miss
i
n
g "q" to pa
t
ch prompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
Hamano
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 {fet
c
h
,
send}-
p
ack from PROGRAMS as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Junio C Hamano
Merge
b
ranc
h
'ef/m
a
i
nt-
f
ast-export' into maint
commit
|
commitdiff
|
tree
2009-04-19
J
unio C Hamano
Merge
b
ranch 'mm/
m
aint-add-p
-
quit
'
into maint
commit
|
commitdiff
|
tree
2009-04-19
Junio
C
Ham
a
no
Merge branch 'lt/maint-re
f
log-expire'
i
nto
maint
commit
|
commitdiff
|
tree
2009-04-19
Juni
o
C
Hamano
Merge bran
c
h 'jc/maint-shared-literal
l
y' i
n
t
o maint
commit
|
commitdiff
|
tree
2009-04-19
Matt
h
ieu Moy
Upda
t
e gi
t
-add
.
txt accord
i
ng
to t
h
e new
p
ossibil
i
ties
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Je
f
f King
add-int
e
racti
v
e: refactor mode
h
u
n
k h
a
ndl
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Matt
h
ieu Moy
git add -p: ne
w
"quit" com
m
a
nd at t
h
e prompt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Juni
o
Hamano
Speed up
r
eflog
p
runing of unreachable commit
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Linus Torv
a
lds
C
l
ean up reflog un
r
eachability pruning decision
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Eri
k
Faye-Lund
builtin-fast-e
x
port
.
c: h
a
ndle nested tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik Fa
y
e-
L
und
builtin
-
fast-export
.
c: fix
crash on tagged
t
r
ees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik
F
aye
-
Lund
b
u
iltin-fast-exp
o
rt
.
c: turn error into w
a
r
n
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye-Lund
test-suite: adding
a
t
e
st for fast-export
w
i
th tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
J
unio C Hamano
Descr
i
be 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
b
ranch 'maint-1
.
6
.
1
'
into maint
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
M
e
rge branch 'maint-1
.
6
.
0'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Juni
o
C
Hamano
Merge
b
r
anch 'bs/maint-1
.
6
.
0-tr
e
e-w
a
lk-prefi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Junio C
H
amano
Me
r
ge branch 'js
/
m
a
i
n
t
-submodule-ch
e
ckout' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-18
J
unio C Haman
o
Merge branch 'cb
/
ma
i
nt
-
m
er
g
e-recursive-su
b
m
odule-fix
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Mar
k
us Heidelbe
r
g
d
oc
/
git-dae
m
on: add m
i
ssing argumen
t
s
to max-connections
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' int
o
maint
commit
|
commitdiff
|
tree
2009-04-18
M
arkus Heidelberg
doc/git-daemon: add missin
g
argument
s
to o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
F
r
ank Lichtenheld
init:
D
o no
t
s
egfault on big
G
IT
_
TEM
P
L
A
T
E
_DIR environmen
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Paul Bolle
im
a
p-
s
end:
use correct config
u
ra
t
ion
varia
b
le i
n
document
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Johan Her
l
and
Up
d
a
te docs on behav
i
o
u
r
of 'core
.
sharedRep
o
sitory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/gitattributes
:
cl
a
r
i
fy location of c
o
nfig text
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-18
Junio C
H
amano
Merge branch
'
main
t
-1
.
6
.
1' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merg
e
b
r
anch
'maint-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Thom
a
s Jaro
s
ch
Fix buffer o
v
erflow in config
p
a
rser
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-16
Ulrich Win
d
l
gi
t
-apply: fix
opt
i
on des
c
r
i
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Li
n
us Tor
v
alds
show_ob
j
ect
(
): push path_name() call further down
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-13
Lin
u
s Torv
a
lds
process_{tr
e
e,blob}: show o
b
jects w
i
th
o
ut
b
uffering
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Junio C Ha
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 b
r
anc
h
'maint-1
.
6
.
1
' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2009-04-12
Junio C
H
amano
Me
r
g
e b
r
a
nch 'maint-1
.
6
.
0'
i
nto maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-12
D
a
niel Cheng (aka
.
.
.
State t
h
e
e
f
fect of
filter-branch on graft explicitly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Linus Torvalds
process_{tree,
b
lob}:
Remove
u
s
e
less xstrdup ca
l
ls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Johannes Sixt
t130
1
-shared-r
e
po:
fix
forced modes test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio
C Ha
m
ano
Start
1
.
6
.
2
.
3 preparation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Mer
g
e branch 'jc/shared
-
liter
a
l
ly'
into mai
n
t
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge bran
c
h 'jc/mai
n
t-1
.
6
.
0-dif
f
-
b
orr
o
w-car
e
f
u
l
ly
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
J
unio C
Hamano
Merge branch
'
maint
-
1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge
b
ra
n
ch
'
maint-1
.
6
.
0' into
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge
branch '
j
c/
m
aint-1
.
6
.
0-kee
p
-pack' i
n
t
o maint
commit
|
commitdiff
|
tree
2009-04-09
Junio C
Hamano
Merge br
a
nch 'jc/maint-1
.
6
.
0-blam
e
-s' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Ju
n
io C Ha
m
ano
Merge bra
n
ch 'bc/maint-1
.
6
.
1-bran
c
h-
d
e
lete
d
-was
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C
H
amano
Merge branch 'js
/
mai
n
t
-
1
.
6
.
0-e
x
ec-path-en
v
' into maint
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge branch
'tr/maint
-
1
.
6
.
1-doc-format
-
p
a
t
c
h--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
B
j
örn Stei
n
brink
proce
s
s_{tree,blob
}
: R
e
move use
l
ess
x
strdup ca
l
ls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu Moy
git-p
u
ll
.
sh: better
war
n
ing message for "git pull"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio
C
Hamano
Merge branch 'maint-1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-04-08
J
a
ri Aalto
Change double quotes to single qu
o
tes in m
e
ssage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio
C Hamano
Merge
b
r
anch 'main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
Jason M
e
rr
i
ll
D
o
cumentatio
n
: clarify
.
gitattri
b
utes search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
i
t-checkout
.
txt: c
l
arify that <branch> a
p
plie
s
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-ch
e
ckout
.
t
x
t: fi
x
incorr
e
ct
statement
ab
o
ut HE
A
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Julien Danj
o
u
git submodule: fix
u
sa
g
e line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ham
a
n
o
Merge branch 'maint-1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
2009-04-05
Junio
C
Hamano
Merge bra
n
c
h 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus He
i
delbe
r
g
doc/git-pack-re
f
s: fix
t
wo gr
a
m
mar issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff
K
i
ng
commi
t
: abort
c
o
m
mit if inte
r
act
i
ve add failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens
B
u
cha
c
h
er
simp
l
ify o
u
tput
of conflict
i
ng merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
l
e
mens
B
uchacher
up
d
a
t
e
cache for
c
onflict
i
ng
s
ub
m
od
u
l
e
e
n
tries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens
Buchacher
add tests for merging with subm
o
dules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next