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
Merge branch 'sp/maint-index-pack'
2008-07-17
Junio C Hama
n
o
Merge branc
h
'sp/maint-inde
x
-pack'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Hamano
Merge branch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hama
n
o
Start
preparing 1
.
5
.
6
.
4 release
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johannes
Schindel
i
n
git fetch-
p
ack: do
not complain
a
bout "no common
commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
unio C Hama
n
o
M
erge bra
n
ch 'js/maint-pretty
-
ma
i
lmap
'
into mai
n
t
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C
H
am
a
no
Me
r
ge bran
c
h 'sp/ma
i
nt-bash
-
completi
o
n
-
optim' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hama
n
o
Merge
b
ranch 'sp/main
t
-
p
ac
k
-
mem
u
se
'
into ma
i
nt
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'ls
/
m
a
int
-
mail
i
n
f
o
-patch
-
l
a
bel' into m
a
int
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge b
r
anch 'j
s
/
ma
i
nt-daemon-
s
yslog' into
m
ain
t
commit
|
commitdiff
|
tree
2008-07-16
S
tephan Be
y
e
r
rebase-i:
k
e
e
p
old parents when pre
s
er
v
ing merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
o
hanne
s
S
i
xt
t
7
6
00-merge: Use test_expe
c
t_fa
i
l
u
re to test option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
D
m
itry Pota
p
ov
Fix buffer ove
r
flow in
p
repa
r
e_attr_s
t
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Pota
p
ov
F
ix buffer
ov
e
rflow in git diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitry Pot
a
pov
Fix buffer over
f
low in git
-
gr
e
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Sun
g
Hyun N
a
m
t/M
a
kefi
l
e: use
s
p
e
cified s
h
ell when running agg
r
egation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
La
r
s Noschins
k
i
gi
t
-cv
s
server: f
i
x call to non
e
xis
t
ant cleanupWorkDir
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Na
n
ako Shiraishi
parse-options
.
c: make check
_
typos()
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shiraishi
builtin-describe
.
c: make a gl
o
bal
va
r
iable "p
a
ttern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Na
n
ako Shiraishi
cache
-
tre
e
.
c: make
ca
c
he_
t
ree_find() stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Petr Baudi
s
Do
c
umentation/git
-
cherry-
p
ic
k
.
txt et a
l
.
: Fix misleading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
J
un
i
o C Haman
o
t/a
g
gregate-re
s
ults: whit
e
space
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Eric Won
g
t/
l
ib-git
-
s
v
n: fix
S
VN_HTTPD tests to work with "
t
rash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C Hamano
Merge branch 'm
v
/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
J
u
n
io C Hama
n
o
Merge br
a
nch 'ag/rew
r
ite
_
one'
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C Hamano
Merge
b
ranch 'sp/win'
commit
|
commitdiff
|
tree
2008-07-16
J
unio C Ha
m
an
o
Merge b
r
anch 'js/more
-
w
in'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge br
a
nch 'js/maint-pretty
-
mailmap'
commit
|
commitdiff
|
tree
2008-07-16
J
o
h
annes Schindelin
Rena
m
e "
.
dotest
/
" to
"
.
git/rebase" and
"
.
dot
e
st-merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
J
u
nio C Ham
a
no
U
p
d
a
te draft release
notes to 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Joh
a
n
nes Sch
i
ndeli
n
s
h
ortlog: s
u
p
port --prett
y
=format: option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ciaran McCreesh
Make git
-
add -i accep
t
ran
g
e
s
lik
e
7-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Pavel Roski
n
t9600: allow
testing with cvsps 2
.
2, including beta
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index-pack: Honor core
.
deltaBaseCacheLimit when re
s
olving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
in
d
ex-pack
:
Track the object_entr
y
th
a
t crea
t
es
ea
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index
-
p
a
c
k
: Cha
i
n
t
he struct
base
_
da
t
a on the st
a
ck
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn
O
.
P
e
a
r
ce
index-pack:
Refa
c
tor base
a
rguments
o
f
res
o
lve_
d
elta
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
J
u
n
i
o C Hama
n
o
Merge git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hama
n
o
Merge bra
n
ch
'
js/merge-r
r
'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge b
r
anch '
s
b/rerere-lib'
commit
|
commitdiff
|
tree
2008-07-15
Ju
n
io C Hamano
Merge bran
c
h 'ls/m
a
i
n
t-mailinfo-patch-lab
e
l'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Ha
m
ano
Merge bran
c
h 'om/rerere-ca
r
eful'
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
Hamano
Merge b
r
anch 'jc/branch-merged'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Ha
m
a
no
Merge branch 'jc/r
e
base-orig-head'
commit
|
commitdiff
|
tree
2008-07-15
S
h
awn O
.
Pearce
ba
s
h compl
e
tion: Re
m
o
v
e d
a
sh
e
d command
c
ompletion support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge branch 'sp
/
maint-bash
-
completion-optim'
commit
|
commitdiff
|
tree
2008-07-15
Nicolas Pitre
resto
r
e
leg
a
c
y
b
e
havior
for rea
d
_sha
1
_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
T
eemu L
i
konen
bash: Add long option comp
l
etion f
o
r 'git send-ema
i
l
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mar
k
Levedahl
git-submodu
l
e
-
register s
u
bmodule URL if adding in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mark
L
e
vedahl
g
i
t-submodule
-
make
"
s
u
b
m
o
dul
e
ad
d
"
more stri
c
t
,
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Frederik Schwarzer
git-svn: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
João Abecasis
git-s
v
n
:
find-r
e
v
a
nd rebase for
S
V
N::Mirr
o
r re
p
ositories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
J
unio C Hamano
tutorial:
cl
a
ri
f
y "pull" is
"f
e
t
c
h + merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ian K
a
tz
tutor
i
al: use prompt wit
h
user names in exa
m
ple, to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shaw
n
O
.
Pear
c
e
bash comple
t
ion: Resolv
e
git
show ref:path
<
ta
b
> losing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
J
unio C Haman
o
reduce_heads(): protect from duplicate input
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio
C
Hamano
Update draf
t
re
l
ease n
o
tes
f
or 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Sh
a
wn O
.
Pearc
e
bash com
p
letion: Append space
a
fter fi
l
e nam
e
s hav
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Lukas
Sands
t
röm
git-mai
l
info: Fix getting the subject from the in-
b
ody
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
J
u
nio
C Hamano
Merge branch
'
sp/maint-bash-com
p
letion-optim
'
commit
|
commitdiff
|
tree
2008-07-13
S
hawn O
.
Pearce
b
a
sh compl
e
tion
:
Don't offer "
a
.
.
" as a
comp
l
et
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
R
amsay Jone
s
git-request-pull: replace
c
all to de
p
recat
e
d peek-remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
Make rebase--interactive use OPTIONS_
S
PEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
t3404: test two "pr
e
serve me
r
ges
w
i
th -p" cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
St
e
phan Beyer
git-a
m
/git-mai
l
split: correc
t
synopsis for read
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
J
u
nio C Hamano
M
erge bran
c
h 'ma
i
nt' to syn
c
with 1
.
5
.
6
.
3
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
GIT 1
.
5
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merge
b
r
anch 'ph/par
s
eop
t
-step-b
l
ame'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Me
r
ge branch
'am/stash-b
r
anch'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merge
b
ran
c
h
'sg
/
s
tash
-
k-i'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Ha
m
ano
Mer
g
e br
a
n
ch
'
jc/repor
t
-tracki
n
g'
commit
|
commitdiff
|
tree
2008-07-13
Junio
C
Hamano
Merge
b
ranch
'js/pick-ro
o
t'
commit
|
commitdiff
|
tree
2008-07-13
Juni
o
C Haman
o
Merge branch 'ab/bun
d
le'
commit
|
commitdiff
|
tree
2008-07-13
Jun
i
o
C
H
am
a
n
o
Merge
branch 't
r
/add-i-e
'
commit
|
commitdiff
|
tree
2008-07-13
Steffen Prohaska
h
elp (Windo
w
s): Display HTML
i
n
defa
u
lt b
r
o
w
s
e
r using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stef
f
en Pro
h
aska
h
el
p
.
c: Add support f
o
r
htmldir relative to
git_exec
_
p
a
th()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Ste
f
f
en
Prohaska
Move code int
e
rpreti
n
g pat
h
r
elati
v
e t
o
ex
e
c-dir
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Sverre
H
vammen Johansen
reduce_heads(): thin
k
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add
a new te
s
t for git-merg
e
-resol
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
t6021: add a n
e
w
t
est for git-merge-re
s
olve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
A
lexander N
.
Ga
v
rilo
v
Fix quadra
t
ic pe
r
formance in re
w
rite_one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beye
r
git-am
:
Do
n
ot exit silently if com
m
itter is
u
nse
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Shawn
O
.
Pearce
b
ash completion: Improve responsiveness
o
f git
-
l
og
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Johanne
s
Schindelin
Move
M
ERGE_RR fro
m
.
git/rr-cache/ into
.
git/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Junio C Hamano
t
0
004:
f
i
x timing bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Joha
n
nes Schindelin
Add pretty
f
orm
a
t %aN wh
i
ch gives the author
name,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Mike Pape
We need to check
for
m
s
ys as wel
l
as
Windows
in add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Johann
e
s Schindeli
n
Conver
t
C
R
/LF to LF in ta
g
sign
a
t
u
res
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Dmit
r
y Kakurin
Fixed text file auto-d
e
t
ection: trea
t
EOF character
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
L
u
kas
Sandström
git-mailinfo: docu
m
en
t
the
-n
optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Pe
t
r Baudis
Fix backwa
r
ds-i
n
comp
a
tible hand
l
ing o
f
cor
e
.
sh
a
redRepo
s
ito
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Junio C Haman
o
Teac
h
mer
g
e
.
log to "gi
t
-mer
g
e"
again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
S
tephan Beyer
r
e
rer
e
: Separate libgit and builtin fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Olivi
e
r M
a
rin
builtin-rerere: more carefully find co
n
flict ma
r
k
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Junio
C Hamano
a
pply: fix
cop
y
/rename breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
J
u
n
i
o
C
Hamano
M
e
rge branch
'jk/pager-config'
commit
|
commitdiff
|
tree
2008-07-09
Junio C Hamano
Merge branch
'
js/appl
y
-root'
commit
|
commitdiff
|
tree
2008-07-09
J
unio
C
Ham
a
no
Merge branch 'jc/reflog-expire'
commit
|
commitdiff
|
tree
2008-07-09
Robert
Shearman
g
i
t-send-ema
i
l
: Fix a
u
thenticat
i
ng
o
n some servers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Pierre Habouzit
re
v
isio
n
s: r
e
f
a
c
t
o
r
handle_revi
s
i
o
n_opt
into parse_revision_opt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Pierre Habouzi
t
g
it-s
h
ortlog: migrate
to pars
e
-
o
ptions partially
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next