repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Teach 'git merge' that some merge strategies no longer exist
2008-07-20
M
i
k
l
o
s
Va
j
na
T
e
a
c
h
'git merge' tha
t
some merge strategies
n
o
long
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Lars Noschinsk
i
cvsserver:
A
d
d
tes
t
s
uite f
o
r
p
acked
r
e
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Ju
n
io
C
Hamano
Getting clos
e
r to 1
.
6
.
0
-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
J
u
nio C Hamano
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2008-07-19
Alexander
Gavr
i
lo
v
S
upport gitlinks in
f
ast-i
m
p
ort
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
J
unio C Hamano
.
mailmap upda
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
Docume
n
tation/git-mer
g
e
.
t
xt: Pa
r
tial
r
ewrite of How
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
R
ené Scharfe
a
rchive:
r
emo
v
e u
n
us
e
d headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
René Schar
f
e
archive: make zip compress
i
o
n
le
v
el indepe
n
dent from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr
Baudis
Documentation: H
o
w to ignore local changes in tra
c
ke
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Baudis
D
o
cume
n
tation/git-
s
ubmodule
.
txt: Furthe
r
c
l
arify the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Pet
e
r Harris
A
d
d ANSI con
t
rol code emulation for t
h
e Windows console
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Johannes S
i
xt
builtin-clone: rewri
t
e
g
ues
s
_dir_name()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
E
r
ic Ra
i
bl
e
Te
a
ch lookup_prog n
o
t to
select direc
t
ories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Emmes
testsui
t
e for
cvs co -c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lars Noschinski
cvsse
r
ver: Add c
v
s co -c supp
o
r
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
La
r
s Noschinski
cv
s
s
e
r
ver: Add support for p
a
cked refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabian
Emmes
Te
s
tsuite:
Unset CV
S
_
S
ERVER
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Stephan
B
ey
e
r
Link git-
s
hel
l
o
n
l
y
t
o a subset of libgi
t
.
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio
C
Ham
a
no
t9
0
01 (send-email): Do not us
e
h
ardcoded
/b
i
n/s
h
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Ju
n
io C Hamano
GIT 1
.
5
.
6
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Olivier
M
arin
built
i
n-rm:
f
ix ind
e
x
lock file p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
J
unio C
H
am
a
no
Merge branch 'sp/maint-index-pack'
into ma
i
nt
commit
|
commitdiff
|
tree
2008-07-18
Junio
C
Hamano
ht
t
p-fetch: do no
t
SEGV after fetc
h
in
g
a
b
ad pack idx
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Juni
o
C
Hamano
rev-list: honor --qui
e
t
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio C Ha
m
ano
b
u
iltin
-
r
e
mote
.
c
: fix earlier "s
k
ip_prefi
x
()" co
n
version
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
S
t
ephan Beyer
api-run-command
.
txt: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Petr B
a
udis
D
o
cumentation
/
RelN
o
t
e
s-1
.
6
.
0
.
txt: Ex
p
and on the i
n
com
p
atible
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
mai
l
info:
o
f
f
-by-one fi
x
for [PATCH
(foobar)] rem
o
val
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hama
n
o
re
a
d-cache
.
c: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio
C Hamano
Update dr
a
ft
r
eleas
e
note
s
for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
J
u
n
i
o C Hamano
Merge branch 'mv
/
dashless'
commit
|
commitdiff
|
tree
2008-07-17
J
unio C H
a
mano
Merge branch 'ls/mailinfo'
commit
|
commitdiff
|
tree
2008-07-17
Petr B
a
udis
Do
c
umenta
t
ion/
g
it-
s
ubmodule
.
txt: Ad
d
D
e
s
c
ription
s
e
c
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C
H
amano
M
erge branch 'sb/dashles
s
'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
Hamano
Me
r
ge branch 'rs/archi
v
e'
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
i
o
C Ha
m
a
n
o
Merge branch 'ag
/
blame'
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
io C Hamano
Merge bra
n
c
h
'rs/rebase
-
checkout-no
t
-so
-
qui
e
t
'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Mer
g
e
b
ra
n
c
h 'sp/maint
-
index-p
a
ck'
commit
|
commitdiff
|
tree
2008-07-17
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Start pr
e
paring
1
.
5
.
6
.
4
r
el
e
a
se notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Schi
n
delin
g
i
t fetc
h
-
p
ack: do no
t
c
o
mplai
n
about "no
c
ommon com
m
its
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge bra
n
c
h
'j
s
/maint-pretty-mailmap'
into ma
i
n
t
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
a
mano
Merge
b
ranch
'sp/maint-bas
h
-completion-optim' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
Hamano
Me
r
ge branch 'sp/maint
-
pac
k
-mem
u
s
e
' into
m
aint
commit
|
commitdiff
|
tree
2008-07-16
J
unio C Hamano
Merge branch 'ls/maint-m
a
ilin
f
o-patch-
l
ab
e
l' into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
Hamano
Me
r
g
e branc
h
'js/maint-daem
o
n-syslog' in
t
o maint
commit
|
commitdiff
|
tree
2008-07-16
Stephan Beyer
rebase-
i
:
keep old parents when preserving merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Joha
n
nes
S
ixt
t
7
600-
m
er
g
e: Use t
e
st_ex
p
ect
_
failure to test option
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry
P
otapov
Fix buffer overflow in prepare_attr_stack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
D
m
i
try
P
otap
o
v
Fix buffer overflo
w
in git diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry
P
otap
o
v
Fix buffer
o
verflow in git-grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
S
ungHyun Nam
t/Makefile: use specified she
l
l when run
n
ing
a
g
g
r
egation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
L
ars Noschinski
g
i
t-cvsserver: f
i
x ca
l
l to none
x
i
stant cleanupWorkDir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shir
a
ishi
pa
r
s
e
-
op
t
ions
.
c: make check_
t
ypos() st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
N
a
nako Shiraishi
buil
t
in-des
c
ri
b
e
.
c: make a global v
a
ria
b
le "pa
t
te
r
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nan
a
k
o Shira
i
shi
cache-tr
e
e
.
c: m
a
ke cache
_
tree_find() static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Petr Baudis
D
o
c
u
menta
t
ion/
g
it-cherr
y
-pi
c
k
.
txt et al
.
: Fix misleading
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C
Hamano
t/aggreg
a
te-results: w
h
i
tespace fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Eric Wong
t/lib-git-svn: fix SVN_HTTP
D
tests to work w
i
th "trash
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hama
n
o
Merge
branch 'mv
/
me
r
ge-in-c
'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
H
a
mano
Me
r
g
e branch 'ag
/
rewrite_one'
commit
|
commitdiff
|
tree
2008-07-16
J
u
n
i
o C
H
am
a
no
Merge branc
h
'
s
p/win'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C H
a
mano
M
erg
e
b
ranch 'js/more-win'
commit
|
commitdiff
|
tree
2008-07-16
J
u
n
io C Hama
n
o
Merg
e
branch 'js/mai
n
t-p
r
ett
y
-
m
ai
l
map'
commit
|
commitdiff
|
tree
2008-07-16
Johannes
S
chindelin
Rename
"
.
dotest/" to "
.
git/r
e
b
a
se" and
"
.
dotest-merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavr
i
lov
Do not tr
y
to detect
m
ove/cop
y
f
or entries b
e
low threshold
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Alex
a
nder
G
avrilov
A
v
oid
resc
a
nning unchange
d
entries in search for copies
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Jun
i
o C
H
amano
Upd
a
te draft release
not
e
s
t
o 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Johann
e
s
Schindelin
shortlog: support --pretty=format: option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ciaran McCreesh
Make git
-
add -i accept ranges lik
e
7
-
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Pavel Roskin
t
9
600: a
l
low
t
esting
with cvsp
s
2
.
2, including beta
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
archiv
e
: remove extr
a
argumen
t
s
p
arsing code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
a
rchive:
u
nify fil
e
att
r
ibute handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
R
en
é
Sch
a
rfe
archive: centraliz
e
archive entry writing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
R
e
né Scharfe
archiv
e
:
add
b
asele
n
memb
e
r t
o
struct a
r
chiver_a
r
gs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
add
c
on
t
e
xt pointer to read_tree_recursive()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
R
ené
S
c
h
arfe
ar
c
h
i
ve
:
remove args me
m
ber from s
t
ruct archi
v
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index-pack
:
Honor core
.
deltaBaseCacheLimi
t
wh
e
n reso
l
ving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
S
hawn O
.
Pea
r
ce
in
d
ex-
p
ack: Track
the
o
bject_e
n
try t
h
at
creates each
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Sh
a
wn O
.
Pear
c
e
index-pack: Chain the
s
t
ruct base_data
o
n
t
he stack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
P
earce
index-
p
ac
k
: Refactor base argu
m
en
t
s
of r
e
solve_del
t
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
H
amano
Merge
git://r
e
po
.
or
.
cz/git-gu
i
commit
|
commitdiff
|
tree
2008-07-15
J
unio C
H
amano
Merge branch
'
j
s
/
merge-rr'
commit
|
commitdiff
|
tree
2008-07-15
Jun
i
o C Ham
a
no
Merge branch
'
sb/rerer
e
-lib'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hama
n
o
Merge branch 'ls/m
a
int-mai
l
info-patch-label'
commit
|
commitdiff
|
tree
2008-07-15
J
unio C Hamano
Me
r
ge b
r
anch 'o
m
/rerere-careful'
commit
|
commitdiff
|
tree
2008-07-15
J
u
n
io C Hamano
Merge branch 'jc/bra
n
ch-merged'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge branch
'j
c
/rebase-orig-
h
e
a
d'
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
P
e
a
rc
e
bas
h
co
m
pletion
:
Remove das
h
e
d
command
c
ompletion suppor
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io
C Hamano
Mer
g
e
branch 'sp/maint-bash-compl
e
tion
-
optim'
commit
|
commitdiff
|
tree
2008-07-15
Nicolas Pi
t
re
res
t
ore legacy
beh
a
vior
for r
e
ad_sh
a
1_file(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Teemu Likonen
bash: Add long option completion for 'git send-e
m
ail'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark Levedahl
git-
s
ubmodule - register submodule URL if
adding in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark
Levedahl
git-submodule - make "submodule add" more stric
t
, and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
F
red
e
r
i
k
Schwarzer
git-svn
:
typofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
J
o
ão Abecasis
git-svn: find-rev and reb
a
se for SVN::Mirror re
p
ositori
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
tutorial
:
c
l
a
rify "pull
"
is "fetch +
m
erge"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ian K
a
tz
tu
t
or
i
al: use prompt
with user nam
e
s in exam
p
le, to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
S
h
awn O
.
Pear
c
e
bash completion:
Resolve git show ref:path
<
tab>
l
osing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next