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 'rs/rebase-checkout-not-so-quiet'
2008-07-17
Junio C Haman
o
Merge bra
n
ch
'rs/rebase-checkout-no
t
-so-quie
t
'
commit
|
commitdiff
|
tree
2008-07-17
Juni
o
C
H
a
mano
Merge br
a
n
ch 'sp
/
maint-inde
x
-pack'
commit
|
commitdiff
|
tree
2008-07-17
Junio C Ha
m
an
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Ham
a
no
S
t
a
r
t preparing 1
.
5
.
6
.
4
release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Sc
h
inde
l
in
git fetch-pack: do not compla
i
n about "no co
m
m
o
n commi
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io C Ha
m
ano
Merge bra
n
ch 'js/maint-pretty
-
mail
m
ap' into maint
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 's
p
/maint-bash-completion-op
t
im' into
.
.
.
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Mer
g
e branch 'sp/m
a
i
nt-
p
ack-memuse' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2008-07-16
Junio
C Hamano
Merge
b
ranch 'l
s
/maint-mail
i
nfo-patch
-
l
a
bel' into m
a
int
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
amano
Merge branc
h
'
j
s/
m
aint-daemon-syslog' into maint
commit
|
commitdiff
|
tree
2008-07-16
Stephan Beyer
rebase-i: keep old paren
t
s whe
n
preservi
n
g merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Johannes Sixt
t
7
600-merge: Use test_expect_failure to test op
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
D
mit
r
y Po
t
apov
Fix buf
f
er ove
r
flow
i
n
prep
a
re_attr_stack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
D
m
i
t
ry Potapov
Fix b
u
ffer overflow in git
d
iff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Dmitr
y
P
otapov
Fix
b
u
ffer
ove
r
f
low in git-grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
SungHyun Nam
t/M
a
kefi
l
e: use sp
e
c
i
f
ied s
h
ell
whe
n
running aggreg
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Lars No
s
c
hinski
git-cvsserver: fix call t
o
nonexistant cl
e
an
u
pWorkDir
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Sh
i
ra
i
shi
parse-opt
i
ons
.
c
: m
a
ke check_ty
p
os() s
t
a
t
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Shiraishi
b
u
ilt
i
n-descr
i
b
e
.
c: ma
k
e a global variable "pattern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Nanako Sh
i
r
a
ishi
cache-tree
.
c: make cache_tree_find()
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Petr Baudis
Documentati
o
n/git-cherry-pick
.
txt et
al
.
: Fix mislead
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
amano
t
/
aggrega
t
e-results: whitespace fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
E
r
ic Wong
t/lib-git
-
svn: fi
x
SV
N
_HTTPD tests to work
with "trash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
Merge branch 'm
v
/merge
-
in-c'
commit
|
commitdiff
|
tree
2008-07-16
J
u
nio C Hamano
Merge branch 'ag/re
w
ri
t
e_on
e
'
commit
|
commitdiff
|
tree
2008-07-16
Juni
o
C
Hama
n
o
Merge branch 'sp/win'
commit
|
commitdiff
|
tree
2008-07-16
Junio C
H
a
m
ano
Merge branch 'js/m
o
re-win
'
commit
|
commitdiff
|
tree
2008-07-16
Ju
n
io
C
Ham
a
no
Merge branch 'js/
m
ai
n
t-
p
retty-mailmap'
commit
|
commitdiff
|
tree
2008-07-16
Joh
a
nnes
S
chin
d
elin
Rename "
.
dotest/" to "
.
git/rebase"
a
n
d "
.
dotest
-
m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Ha
m
ano
Update draft release notes to 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
J
ohannes Schindelin
sho
r
tlog: sup
p
ort --pre
t
ty=format:
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ciaran McC
r
eesh
M
ake gi
t
-add
-
i
accept ranges like 7-
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Pa
v
e
l
Roskin
t9600
:
allo
w
te
s
t
ing wit
h
cvsps 2
.
2, in
c
lu
d
ing
bet
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
S
hawn O
.
Pearce
index-pac
k
:
Honor core
.
d
eltaBaseCache
L
imit w
h
en resolving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearce
index-pack: Track the obj
e
ct_entry that c
r
e
a
tes e
a
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shaw
n
O
.
P
e
arce
index
-
pack: Chain the
s
truct
ba
s
e_d
a
ta on the stack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
S
h
awn O
.
Pearce
i
n
dex-
p
ack: Refactor
b
ase argum
e
nts of resol
v
e_
d
elta
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C H
a
mano
Merge
git://rep
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-15
Junio C H
a
mano
Mer
g
e branc
h
'js/merge-rr'
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C
H
amano
M
e
r
g
e b
r
anch
'sb/rerere-lib'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge branch
'
ls/m
a
int-maili
n
fo-pa
t
ch-label'
commit
|
commitdiff
|
tree
2008-07-15
Juni
o
C Hamano
Merge
branch 'o
m
/rerere-car
e
f
ul'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Mer
g
e
b
ranch 'jc/branch-merged'
commit
|
commitdiff
|
tree
2008-07-15
Junio C H
a
mano
Merge b
r
anch 'j
c
/rebase-orig-head'
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearc
e
b
ash
c
o
mple
t
ion
:
Remov
e
dashed command
c
o
m
pletion suppor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Jun
i
o C Hamano
Merge
branch
'
sp/m
a
i
n
t-bash-comp
l
etion-optim'
commit
|
commitdiff
|
tree
2008-07-15
Nicola
s
Pitr
e
re
s
tore legacy behavior for read_
s
h
a1_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Teemu Likonen
b
a
sh:
A
dd long o
p
t
i
on completion for 'git
s
end-email'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ma
r
k Levedah
l
git-s
u
bmo
d
ule - register submodule UR
L
if add
i
ng
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Mark L
e
vedahl
git-submodule - make "subm
o
dule add" more strict
,
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Frede
r
ik Schwarzer
g
i
t-
s
vn:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
J
o
ão Abe
c
a
si
s
git-svn: find-rev and r
e
ba
s
e for SVN::Mirror repositories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
J
uni
o
C Hamano
tu
t
orial: clar
i
fy
"p
u
l
l
" is "fetch + merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Ia
n
Katz
t
u
toria
l
:
use prompt with user names
in exampl
e
, to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pearc
e
bash completion:
R
esolve git show ref
:
path<tab> losing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio C Hamano
gi
t
-rebase: report check
o
ut fai
l
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Junio
C Hamano
re
d
uce_hea
d
s(): pro
t
ect from duplicate
i
nput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
J
u
n
i
o C
Hamano
U
pdate
d
ra
f
t releas
e
notes for 1
.
6
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Sh
a
wn O
.
P
earce
bash compl
e
t
ion: App
e
nd spac
e
a
f
ter file na
m
es have
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-14
Lukas
S
andstr
ö
m
git-
m
ai
l
info: Fix getting the subje
c
t
f
rom
the in-body
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Mer
g
e branch 'sp/maint-bash-comp
l
etion-optim'
commit
|
commitdiff
|
tree
2008-07-13
Shaw
n
O
.
Pearce
bas
h
completion: Don't offer "a
.
.
" as
a
co
m
pletio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
R
a
msay Jones
git-request-pull:
r
e
p
l
a
ce call to depr
e
cated
p
ee
k
-remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
Ma
k
e re
b
ase--inte
r
a
cti
v
e use OPTIONS_SPEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
t
3
404: test two "preser
v
e me
r
ges wi
t
h -p" cas
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
git-am
/
git-mailspl
i
t: correc
t
synopsis f
o
r
reading
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
J
u
nio C
Hamano
Mer
g
e b
r
anch '
m
aint' t
o
syn
c
with 1
.
5
.
6
.
3
commit
|
commitdiff
|
tree
2008-07-13
J
u
nio
C
Ha
m
ano
G
IT 1
.
5
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Mer
g
e branch
'
ph/
p
ar
s
eopt-step-blam
e
'
commit
|
commitdiff
|
tree
2008-07-13
Junio
C Hamano
Mer
g
e bran
c
h 'am/stash-branch'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Haman
o
Merge b
r
a
n
c
h 'sg/stash
-
k-i
'
commit
|
commitdiff
|
tree
2008-07-13
Ju
n
io C Hamano
Merge branch 'jc/repor
t
-
trackin
g
'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merge
b
ranch 'js/pick-root
'
commit
|
commitdiff
|
tree
2008-07-13
Junio C H
a
mano
Merge branch 'ab/b
u
ndle'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hama
n
o
Mer
g
e
bran
c
h 'tr/add-i-e'
commit
|
commitdiff
|
tree
2008-07-13
Ste
f
fen Prohask
a
help (Wi
n
dow
s
): D
i
splay
H
TML in d
e
fault browser
using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Steffen
Prohaska
help
.
c: Add supp
o
rt fo
r
htmldir relative to git_exe
c
_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
S
teffen Prohaska
Mov
e
code i
n
terpret
i
ng path relative to exec-
d
ir t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Sverre Hvammen J
o
hansen
reduce_
h
eads(): think
o
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new test fo
r
gi
t
-
m
erge-resol
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Miklos V
a
jna
t6021
:
a
d
d a
new test for g
i
t
-merge-reso
l
ve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Alexan
d
er N
.
Gavri
l
ov
F
ix
q
uadra
t
ic performa
n
ce in rewrite_one
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Stephan
B
ey
e
r
g
i
t-am: Do no
t
exit
s
ilently if c
o
mmitte
r
is unset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Shawn O
.
Pearce
bash compl
e
tion:
Improve respon
s
iven
e
ss of git-log
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-13
Johannes Schindelin
Move MERGE
_
R
R from
.
git/rr-cache/ into
.
git/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Junio C
Hamano
t000
4
: fix
t
iming bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Johannes Sch
i
n
d
eli
n
Add pretty format %aN which gives
t
h
e author name,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Mike Pape
We
n
eed
t
o check for msys as we
l
l as Windows in add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Joha
n
ne
s
Schindeli
n
C
onvert CR/LF
t
o L
F
in tag signatur
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Dmitry Kakurin
Fixed
t
e
xt file auto-
d
e
t
ec
t
ion
:
treat EOF
c
h
a
r
acter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Lukas Sand
s
tröm
git-mailinfo: document the -n optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-12
Pe
t
r Baudis
Fi
x
backwards-incompat
i
bl
e
handli
n
g
o
f core
.
sha
r
ed
R
epo
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Ju
n
io
C H
a
m
a
no
Teac
h
merg
e
.
log to
"git-merge
"
again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Stephan Be
y
e
r
r
e
rere
:
S
e
parate
l
ib
g
i
t and bui
l
t
i
n functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Olivier Marin
built
i
n-r
e
r
ere: more carefully
f
ind conflict
m
arkers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-10
Junio C Ham
a
no
apply: fix copy/rename breakag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-09
Juni
o
C
Hamano
Merge branch 'jk/p
a
ger-
c
onfig'
commit
|
commitdiff
|
tree
2008-07-09
Junio
C
H
amano
Merg
e
branch 'js/
a
pply
-
root'
commit
|
commitdiff
|
tree
2008-07-09
Junio C Hamano
Merg
e
branch 'j
c
/
re
f
lo
g
-expire'
commit
|
commitdiff
|
tree
2008-07-09
Robert S
h
earman
git-s
e
n
d-email:
F
ix authe
n
ti
c
ating on some servers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next