repo.or.cz
/
git
/
jnareb-git.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 Olszew
s
k
i
m
e
r
g
e-recursive: nev
e
r leave index
unmerged while
re
c
u
r
s
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
G
IT 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 b
r
anch 'np/maint-no-of
s
-delta' i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hamano
Merge branc
h
'maint-1
.
6
.
1' in
t
o maint
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
J
unio
C Hama
n
o
Merge
b
ranch 'jc
/
maint-read-tree-multi
'
into maint
commit
|
commitdiff
|
tree
2009-05-03
Junio
C Hamano
Merge
branch 'mk/ma
i
nt
-
apply-swap' into
maint
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ha
m
a
n
o
Me
r
ge branch 'mm/maint-add-p-
q
uit'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2009-05-03
Junio
C
Hamano
Merge branch 'lt/
p
ack-object-me
m
use
'
in
t
o
maint
commit
|
commitdiff
|
tree
2009-05-03
J
uni
o
C H
a
mano
M
erge branc
h
'jc/mai
n
t-1
.
6
.
0-k
e
e
p
-pack' i
n
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Hama
n
o
Merge branch
'
jc/maint-1
.
6
.
0
-diff-b
o
rrow-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-05-03
Junio C Ham
a
no
M
erge bra
n
ch
'bs/ma
i
nt-1
.
6
.
0
-
tree-w
a
lk-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-05-02
Nicolas Pitre
honor repack
.
usedeltabase
o
ffset
w
he
n
fetch
i
n
g p
a
cks
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 m
a
int
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ha
m
a
no
Merge bran
c
h 'main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio
C Haman
o
diff -c -
p
:
do not die on submodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Juni
o
C
Hama
n
o
Me
r
g
e branch 'main
t
-1
.
6
.
1' int
o
maint
commit
|
commitdiff
|
tree
2009-04-28
Jun
i
o C Ham
a
no
M
e
rge branc
h
'
m
aint-
1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-28
Lin
u
s T
o
rvalds
grep: fix s
e
g
f
ault when "git gr
e
p
'
('" is given
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
Al
l
a
n
Caff
e
e
Doc
u
mentation: fix a grammatic
a
l error in
api-
b
uiltin
.
t
x
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
A
llan Caffee
b
u
iltin-merge: fix
a
typo in an error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
Mer
g
e branch '
m
ain
t
-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-04-25
Junio
C H
a
mano
Merge branch 'main
t
-1
.
6
.
0' into main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boyd
test-gen
r
andom:
A
dd
n
ew
l
i
n
e to
u
sage string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
M
i
chał Kiedrowicz
t
e
sts: make test-apply-criss-cross-rename more robu
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Mich
a
ł Kiedrowicz
builtin-appl
y
:
k
eep info
r
m
a
t
i
on about files to be d
e
l
eted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Michał
Kiedrowicz
test
s
: test app
l
ying criss-cross rename pat
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Fran
k
Lic
h
tenhel
d
git
c
v
s-
m
i
gration: Link
t
o
git-cvsimport docume
n
tation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Johann
e
s
Schindelin
F
i
x
off-by-one in
read
_
tree_recursi
v
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Jun
i
o C Hamano
c
heckout branch: prime cache-tree fully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Jun
i
o C Hamano
read
-
t
ree -m A B: prime cache-tree f
r
om th
e
switched
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
J
u
ni
o
C
Hamano
Mov
e
prime_ca
c
h
e_tree(
)
t
o
c
ache-tree
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Juni
o
C Ham
a
no
rea
d
-
tree
A B:
d
o not corrupt cache-t
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
W
incent Colai
u
ta
git
a
dd -p:
a
d
d
missi
n
g "q" to patch prompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Ha
m
ano
GIT 1
.
6
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Nguyễn Thái N
g
ọc D
u
y
Makefile: remove {fe
t
ch,se
n
d}-pack f
r
om PRO
G
R
A
MS
as
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Junio C H
a
mano
M
e
r
g
e branch 'ef/maint-fas
t
-export
'
into
maint
commit
|
commitdiff
|
tree
2009-04-19
Junio C
Hamano
Merge br
a
nch
'mm/maint-a
d
d-p-quit
'
into maint
commit
|
commitdiff
|
tree
2009-04-19
J
u
nio
C
H
am
a
no
Merge b
r
anch 'lt
/
maint-
r
eflog-expir
e
' into maint
commit
|
commitdiff
|
tree
2009-04-19
Ju
n
io C Ha
m
ano
Merge branch 'jc/mai
n
t-shared
-
liter
a
lly' into maint
commit
|
commitdiff
|
tree
2009-04-19
M
a
tth
i
eu M
o
y
Up
d
ate git-
a
d
d
.
tx
t
acco
r
d
i
ng to
the new p
o
ssib
i
lities
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Jeff King
add-interactive: refactor mode hunk handl
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
M
a
tt
h
ieu Mo
y
git add -p: new "quit" command
at the
prompt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Junio Hamano
S
peed u
p
r
e
f
log pruning o
f
unre
a
cha
b
le commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Linus Torvalds
Cle
a
n up refl
o
g unre
a
c
habi
l
i
t
y pruning 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: handle ne
s
ted tags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Eri
k
Faye-Lund
builtin-fast-export
.
c: fix crash on
tag
g
ed trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye-Lund
builtin-fast-e
x
port
.
c: turn error into warni
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye-
L
und
te
s
t-suite: adding
a test for fast
-
export with t
a
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Describe fixes si
n
ce 1
.
6
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
J
u
n
i
o
C Hamano
Merge br
a
nch 'm
a
int-1
.
6
.
1' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-04-18
Jun
i
o C Hamano
Merge branch 'main
t
-1
.
6
.
0'
into
main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Junio C Haman
o
Merge b
r
anch
'
b
s/main
t
-1
.
6
.
0-tree-walk-prefix' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
Merge br
a
nch 'js/main
t
-su
b
mod
u
l
e
-
c
h
eck
o
ut
'
in
t
o main
t
commit
|
commitdiff
|
tree
2009-04-18
Junio C Hamano
M
e
rg
e
bran
c
h
'cb/maint-merge-
r
e
c
ursiv
e
-su
b
mod
u
le-fix
.
.
.
commit
|
commitdiff
|
tree
2009-04-18
Markus Heidel
b
erg
doc/git-
d
aemon:
ad
d
mi
s
sing arguments
to max-connect
i
ons
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Juni
o
C
Hamano
Merge b
r
anch
'
m
aint-1
.
6
.
0'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-18
Mar
k
us Heidelberg
do
c
/
g
it
-
daem
o
n
:
add missing
argum
e
nts
to options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Frank Lichtenheld
init:
Do
no
t
segfault on big GI
T
_
T
EMPLATE_
D
IR envi
r
onment
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Paul Bolle
imap
-
send:
u
se
c
orrect
c
onfiguration va
r
iable in documentat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Johan Her
l
and
U
pdate do
c
s on b
e
h
a
viour of 'core
.
shared
R
eposi
t
ory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Jeff King
doc/gitattributes: clarify location of config text
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-18
Junio C Haman
o
Me
r
ge branch
'
main
t
-1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-04-18
Junio
C
H
amano
Merge
b
ran
c
h '
m
aint-1
.
6
.
0'
i
nto
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-18
Th
o
m
a
s Jaro
s
ch
Fix buffer overflo
w
in c
o
nfig
parser
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-16
U
lrich Windl
git-apply
:
fi
x
option descripti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-13
L
i
nus Torva
l
ds
show_
o
b
ject(): push path_name() call
f
urther down
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-13
Linus Torvald
s
process_{tree,blob}:
s
ho
w
obj
e
cts
w
it
h
out
buffering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
Junio C
Hama
n
o
GIT
1
.
6
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
Jun
i
o C Hamano
Merge
b
r
a
nch 'maint
-
1
.
6
.
1
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
M
e
r
ge branch 'maint-1
.
6
.
0' into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-12
Dan
i
el Che
n
g (aka
.
.
.
Stat
e
the e
f
fect of filter-
b
ra
n
ch on
graft ex
p
licitly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
Linus Torvalds
p
roces
s
_{tree,blob}: Re
m
o
ve useles
s
xstrdup ca
l
l
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-12
J
o
hannes Sixt
t1301-shared-repo: fix forced modes
te
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-09
Jun
i
o C Hama
n
o
Start 1
.
6
.
2
.
3 preparation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hama
n
o
Merge branch 'jc
/
s
hared-literall
y
' into maint
commit
|
commitdiff
|
tree
2009-04-09
Juni
o
C Hama
n
o
Merge branch
'
j
c
/ma
i
nt-1
.
6
.
0-diff-borrow-
c
arefully
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio
C
Hamano
Merge
branch 'main
t
-1
.
6
.
1' into
main
t
commit
|
commitdiff
|
tree
2009-04-09
Jun
i
o C
Ha
m
a
n
o
Merge
branch 'maint-
1
.
6
.
0' into maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Ju
n
io C H
a
mano
Merge b
r
anch
'
jc/
m
aint-1
.
6
.
0-ke
e
p-pack' into maint
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
Merge bra
n
ch 'jc
/
maint-1
.
6
.
0-blame-s
'
in
t
o mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Jun
i
o C Hamano
Merge branch 'bc/maint-1
.
6
.
1-branch-deleted
-
was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Juni
o
C Hamano
Me
r
ge branch 'js/ma
i
nt-1
.
6
.
0-e
x
ec-pa
t
h-env' i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio
C
Hamano
Merge b
r
anch
'
t
r
/
m
aint-1
.
6
.
1-doc-format-
p
atch--
r
o
o
t
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Bjö
r
n S
t
einbrink
process_{tr
e
e
,
b
l
ob}:
R
emov
e
useless xstrdu
p
call
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
atth
i
e
u
Moy
gi
t
-
pull
.
sh: bette
r
w
a
rning message for "g
i
t
pull
"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
Merge
branch 'm
a
int-1
.
6
.
1' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-04-08
Jari Aalto
Change d
o
uble quo
t
es to si
n
gle quot
e
s
in message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hama
n
o
Merge branch 'maint-1
.
6
.
0
' into mai
n
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
Jason Merrill
D
o
cumentation: clarify
.
gitattributes s
e
ar
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thie
u
Moy
g
i
t-checkout
.
txt: cla
r
i
f
y
that <branch> ap
p
l
ies when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
t
t
h
ieu Moy
git-checko
u
t
.
txt: fix incorrec
t
sta
t
ement about HEA
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjou
g
i
t su
b
module: fix usage line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
M
erge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-05
Junio
C
H
amano
Merge branch 'maint-1
.
6
.
0'
i
n
to ma
i
n
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus
Heidelberg
doc/gi
t
-
pack
-
refs:
fix
tw
o
g
ra
m
ma
r
issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
c
o
m
mit: a
b
or
t
commit if i
n
te
r
active
add fail
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buch
a
c
her
sim
p
lify output of conflicti
n
g me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
u
pd
a
te cache
f
or conflict
i
ng subm
o
dule entri
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
C
lemens Buchacher
add tests for merging
w
it
h
s
ubmodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next