repo.or.cz
/
git.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
Miklos
V
a
jna
Teac
h
'
gi
t
merge'
t
hat som
e
merge st
r
a
tegies no longe
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-20
Lars Noschinski
cvss
e
rv
e
r
:
A
d
d tests
u
ite for pack
e
d refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
J
unio
C
H
a
mano
Getting clo
s
er to 1
.
6
.
0-r
c
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Junio C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-19
Alexand
e
r Ga
v
r
ilov
Support gi
t
l
i
nks in
f
a
s
t-import
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Juni
o
C Hamano
.
mailmap
update
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Ba
u
dis
Doc
u
m
entation/git-me
r
ge
.
txt: P
a
rtial r
e
writ
e
o
f
How
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
R
e
né Scharf
e
a
r
chive: remove unused h
e
aders
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
René Scharfe
a
r
chiv
e
:
mak
e
zip
c
o
mp
r
essio
n
level independent from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Ba
u
dis
Document
a
t
io
n
: How t
o
ignore lo
c
al
changes
i
n
tracked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Petr Ba
u
dis
Do
c
ume
n
tatio
n
/gi
t
-submo
d
u
le
.
txt: Fu
r
the
r
clari
f
y the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Peter Harr
i
s
Add
A
NSI control cod
e
emu
l
ation f
o
r
the Windows cons
o
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
J
ohannes
S
ixt
builtin-clone:
r
ew
r
ite guess_dir_name()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Eric Raible
Teac
h
l
ookup_prog not to select
directories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabian Emm
e
s
testsuite fo
r
cvs co -c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lars N
o
s
chinski
c
v
sserver: A
d
d
cvs co
-
c supp
o
rt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Lars Noschin
s
ki
cvsserver:
Add support fo
r
p
a
cked refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Fabian
E
mmes
Tes
t
sui
t
e: Unset CVS_SERVER
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Stephan Beyer
Link git-shell
o
n
ly to a
subse
t
of
libgit
.
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-19
Ju
n
i
o
C Hamano
t9
0
01 (send-email): Do not
use
h
ard
c
oded /bin/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 Marin
b
uiltin-rm: fix index lock
f
ile path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
J
unio C Ham
a
n
o
Mer
g
e branch
's
p
/ma
i
nt-index-pack' into
m
ai
n
t
commit
|
commitdiff
|
tree
2008-07-18
Jun
i
o C
H
amano
http-fetch: do n
o
t SEGV a
f
ter fetching
a
bad pack idx
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Junio
C Hamano
rev-list: ho
n
or --quiet
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
J
u
nio C H
a
mano
builtin
-
remote
.
c: fix ea
r
lier
"
skip_pref
i
x(
)
"
conv
e
rsion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-18
Stephan Beyer
a
pi-
r
un
-
command
.
t
x
t: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Petr Baudis
Docum
e
nt
a
tion
/
Rel
N
o
t
es-1
.
6
.
0
.
tx
t
: E
x
pand
o
n th
e
incompatible
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C
Haman
o
mailinf
o
: off-by
-
o
n
e
fix for [PATCH (fo
o
ba
r
)
]
removal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
r
ead-cache
.
c: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Update draft relea
s
e notes
for
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merg
e
branch 'mv
/
dashles
s
'
commit
|
commitdiff
|
tree
2008-07-17
Junio
C
Hamano
Merge
b
ranc
h
'ls/mailinfo'
commit
|
commitdiff
|
tree
2008-07-17
Petr B
a
udis
Documentation/git-submodule
.
txt: Ad
d
De
s
crip
t
ion
s
ection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-17
Ju
n
io C Ham
a
no
Merge b
r
anch
'sb/
d
a
shless'
commit
|
commitdiff
|
tree
2008-07-17
Jun
i
o C Ham
a
no
M
e
rge br
a
nch 'rs/archive'
commit
|
commitdiff
|
tree
2008-07-17
J
un
i
o C Hamano
M
e
r
g
e
br
a
nch 'ag/blame'
commit
|
commitdiff
|
tree
2008-07-17
J
u
ni
o
C
H
amano
Merge branch 'rs/re
b
a
se-checkou
t
-not-
s
o-quiet'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Mer
g
e bran
c
h
'
sp/maint-index-pack'
commit
|
commitdiff
|
tree
2008-07-17
J
unio C Hamano
Me
r
g
e
branch
'
maint'
commit
|
commitdiff
|
tree
2008-07-16
J
unio C Hama
n
o
Start
prep
a
ring 1
.
5
.
6
.
4 r
e
l
ease notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Joh
a
n
n
es Schindelin
g
i
t
fetch-pack: do no
t
complain about "no common commits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge
b
ranch 'js
/
maint-pretty-mai
l
map' into
m
ain
t
commit
|
commitdiff
|
tree
2008-07-16
J
u
n
i
o
C
Hama
n
o
Merge branch 'sp/maint-bash-completion-op
t
im' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch
'
sp/m
a
int-pack-memuse' into maint
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o
C Hamano
Merge branch 'ls/m
a
int-ma
i
linfo-p
a
tch-la
b
e
l' into m
a
int
commit
|
commitdiff
|
tree
2008-07-16
Junio C Haman
o
Merge branch 'js/main
t
-daemon-syslog
'
into maint
commit
|
commitdiff
|
tree
2008-07-16
Stephan Beyer
reba
s
e-i: keep
o
l
d
pa
r
ent
s
when p
r
e
s
e
rving merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Sixt
t7600-merge: Use test_expect_failure to tes
t
optio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmitr
y
Potapov
Fix buffer overfl
o
w in
prepare
_
attr_stack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
D
m
itry Po
t
apov
Fix buffer overflow i
n
git diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Potapov
Fi
x
b
uffer overflow in git-grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
S
u
n
gHyun
N
am
t/Makef
i
le: use specified she
l
l when run
n
ing aggregation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Lars Noschinski
git-cvsserver: fix
c
all to nonexi
s
tant cleanupW
o
rkDir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shiraishi
parse-options
.
c: make check_typos() static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shi
r
aishi
bu
i
ltin-describe
.
c:
make
a
g
lobal variable "pattern
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Nanako
Sh
i
raishi
c
ache-tree
.
c: make ca
c
h
e_tree_find() stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Petr Baudis
Documentation/git-c
h
e
r
ry-
p
i
c
k
.
txt et al
.
:
F
i
x misleadin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
t
/aggregate
-
results: whitespace fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Eric
W
o
n
g
t/lib-git
-
svn: fix SVN_HTTPD tests to wo
r
k wit
h
"tr
a
sh
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merg
e
b
r
a
n
ch 'mv/merge-
i
n-c'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
M
e
r
ge branc
h
'ag/re
w
rite_one'
commit
|
commitdiff
|
tree
2008-07-16
J
unio
C
Hamano
M
e
rge bra
n
ch 'sp/
w
in'
commit
|
commitdiff
|
tree
2008-07-16
Junio
C
H
amano
Me
r
g
e branch 'j
s
/more-wi
n
'
commit
|
commitdiff
|
tree
2008-07-16
Junio C H
a
m
a
no
Me
r
g
e
branch 'js/maint-pretty-mail
m
ap'
commit
|
commitdiff
|
tree
2008-07-16
J
o
hannes Schindel
i
n
Rename "
.
dote
s
t/" to "
.
git/rebase" and "
.
d
otest-m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Alexand
e
r
Gavrilov
Do not
t
ry
to detect move/c
o
py for entries below t
h
reshold
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
A
l
ex
a
n
d
er Gavr
i
lov
A
void rescan
n
i
ng
u
nchan
g
ed entri
e
s
in sea
r
ch fo
r
copies
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C
H
amano
Update draft release notes t
o
1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Johann
e
s Schindel
i
n
short
l
o
g: s
u
pport --
p
retty=f
o
rmat: optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ciaran McCreesh
Make git-add
-
i
accept ra
n
ges like 7
-
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Pavel Roski
n
t96
0
0: all
o
w testing with cvsps 2
.
2,
i
ncludi
n
g
b
e
t
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ren
é
Sc
h
arfe
archive: remo
v
e ex
t
ra
a
rgument
s
pa
r
sing
c
o
de
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Re
n
é S
c
harfe
archi
v
e: unify file attribut
e
ha
n
dling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
archi
v
e: centralize
a
rc
h
ive entry writing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Scharf
e
a
rchive:
a
d
d
base
l
en member
to struct archiv
e
r_args
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
R
e
n
é
Schar
f
e
add
c
o
n
text pointer
to read_tree_rec
u
r
s
ive()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
René Scharfe
a
r
c
hive:
remove args
member from struct archiver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
S
h
aw
n
O
.
Pearce
index-pack: Hono
r
core
.
del
t
a
B
a
seCacheLimit
whe
n
reso
l
v
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
S
h
awn O
.
Pea
r
ce
i
ndex-pack: Track
t
h
e
obj
e
ct
_
entry that cr
e
ates each
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index-pack: Chain the
s
truct b
a
se_d
a
ta
o
n the
stack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Sha
w
n
O
.
Pearce
inde
x
-pack: Re
f
a
c
t
or b
a
se
a
rgume
n
ts of resol
v
e_delta
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C
H
amano
Merge branch 'js/merg
e
-rr'
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io
C Hamano
Merge
b
r
a
nch '
s
b/rerere
-
l
i
b'
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
H
ama
n
o
Merg
e
branch 'ls/maint-mailinfo-patch-label
'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge branch 'om/rer
e
re-careful'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
M
erge
b
ranch 'jc/branch-merged'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
M
erge branch
'
j
c
/rebase-or
i
g-he
a
d'
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
bash completion: Remove dashed comm
a
nd
co
m
pletion
support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
i
o C Hamano
Merge br
a
n
ch 'sp/mai
n
t-bash-c
o
mpleti
o
n-optim
'
commit
|
commitdiff
|
tree
2008-07-15
N
icolas
P
i
t
re
res
t
o
re
legac
y
be
h
avior for read_sh
a
1_f
i
l
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Teemu Likonen
bash
:
A
d
d long option
c
ompletion for 'git se
n
d-email'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
M
a
rk Levedahl
git
-
submodule - regis
t
er
s
ubmodule URL if adding in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark
Lev
e
dahl
git-s
u
bm
o
d
u
le - make
"submodul
e
add" more strict
,
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
F
rederik Schwar
z
er
g
i
t-svn: typofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
J
oão Abeca
s
is
gi
t
-
s
vn
:
f
ind-r
e
v an
d
rebase for SVN::
M
irror rep
o
sitories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C
H
a
m
ano
tutorial: clarify "
p
u
l
l
"
is "fetch
+
merge"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ian K
a
tz
tu
t
oria
l
:
use prompt with
user names in e
x
ample, to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
P
e
arce
ba
s
h comp
l
e
tion
:
Resolve git show ref:path<tab
>
losing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next