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
Improve merge performance by avoiding in-index merges.
2007-01-10
Shawn O
.
Pearce
I
mprove merge p
e
rformance by a
v
oiding in
-
i
nde
x
merges
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn O
.
Pearce
Make
git
-
describe
a
b
uiltin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn O
.
P
e
ar
c
e
Don't sav
e
th
e
c
o
mmit buffer in git-
d
escr
i
be
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn
O
.
P
e
ar
c
e
Don't d
i
e in git-http-f
e
tch w
h
e
n fetching packs
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-06
Shaw
n
O
.
Pearce
Increas
e
packedGit{L
i
mit,WindowS
i
ze} on 64 bit sys
t
ems
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn
O
.
P
e
arce
Add test case for up
d
ate ho
o
ks in receiv
e
-pack
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Sha
w
n O
.
Pearce
Upda
t
e p
a
ckedGit c
o
nfi
g
optio
n
d
o
c
u
me
n
t
ation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
S
h
awn O
.
Pearc
e
Teach Git how
to parse s
t
andard power of 2 suffixes
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
U
se
/
dev/null fo
r
update hook s
t
din
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
S
h
awn O
.
Pea
r
c
e
Redirect update hook stdout to
s
tderr
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn
O
.
Pearce
Remove unnece
s
sary argc
p
a
r
a
meter
f
ro
m
run_c
o
m
m
and_v
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Sh
a
wn
O
.
Pearce
Automaticall
y
det
e
ct a
bare git re
p
ository
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Replac
e
"GIT_DIR" w
i
th GIT
_
DIR_EN
V
I
R
ONME
N
T
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shaw
n
O
.
Pea
r
ce
Use PATH_M
A
X constant for --b
a
r
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Force c
o
re
.
filemode to false on
C
ygwin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pearce
Fix random
segfaults in pack-objects
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
ha
w
n
O
.
Pearce
Cleanup read_c
a
ch
e
_from e
r
ror hand
l
ing
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pear
c
e
R
e
place mmap with xmmap, be
t
ter
h
andlin
g
MAP_FAILED
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Release pack win
d
ows
b
efore
r
e
p
o
rting out of
m
emory
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Default core
.
packdGit
W
i
n
dowSize to
1
Mi
B
if NO
_
M
M
AP
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sha
w
n O
.
Pearce
T
e
st suite f
o
r sliding window
m
m
ap imple
m
entat
i
on
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sha
w
n O
.
P
e
arc
e
Crea
t
e pack_rep
o
rt() a
s
a debuggin
g
aid
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
h
awn O
.
Pear
c
e
Suppor
t
unmappi
n
g windows o
n
'tempor
a
ry
'
packfiles
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
hawn O
.
Pea
r
ce
Improv
e
err
o
r message when pac
k
file mmap
f
ail
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Ensure core
.
p
ackedGitWindowSize cannot be l
e
ss than
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pe
a
rce
Lo
a
d
c
ore configu
r
ation in git-ver
i
fy-pack
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
ha
w
n
O
.
Pearce
Fully acti
v
ate the
sliding window pac
k
access
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
h
awn
O
.
P
e
arce
Unmap i
n
divid
u
al windows rat
h
er than
e
ntir
e
files
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Do
c
u
m
ent w
h
y
header
p
a
rsing won't exceed
a
window
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Loo
p
ov
e
r pack_w
i
ndows wh
e
n inflati
n
g/accessing
data
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sh
a
wn O
.
Pea
r
ce
Rep
l
ac
e
use_pa
c
ked_git with w
i
ndow
cursors
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Refactor how we
open pac
k
files to prepare f
o
r multiple
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Cre
a
t
e
read_or_die utility
r
outine
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
P
earce
Use off
_
t f
o
r index an
d
p
a
c
k
file
lengths
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
ha
w
n O
.
Pearce
Re
f
actor p
a
cked_git to prepare for sliding
m
m
ap windows
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Introduce n
e
w config option fo
r
mmap limit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sh
a
wn O
.
Pearce
Rep
l
a
ce
unp
a
ck_en
t
r
y
_gently with
u
npack_entry
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pearce
U
s
e m
e
r
g
e-
r
ecursive in gi
t
-
a
m
-3
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
earce
Allow merging
b
are t
r
ees in merge-
r
ecursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearc
e
M
o
v
e better_branch_name above get_ref in merge-
r
e
cursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sha
w
n O
.
Pearce
All
o
w git-merge to
s
elect the default str
a
teg
y
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn O
.
Pearce
Honor pull
.
{twohead,octopus} in g
i
t-mer
g
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Ensu
r
e `git-pu
l
l`
fails
i
f
`
git-merge` fails
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Use branc
h
names
i
n 'git-reb
a
se
-m' confli
c
t hu
n
ks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sha
w
n
O
.
Pearce
Honor GIT_R
E
FLOG_ACTION i
n
git
-
rebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
w
n O
.
Pea
r
ce
Use GI
T
_REFLOG_ACTION environ
m
ent
v
aria
b
le ins
t
ea
d
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pearce
Create
'
git gc' to perfo
r
m
common maintenance opera
t
ions
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearc
e
Switch
git_mmap to use pread
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn
O
.
Pea
r
ce
Rename gitfakemmap to git_mmap
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn
O
.
Pearce
Disp
l
ay 'theirs' b
r
anc
h
name when p
o
ssible
i
n me
r
ge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
S
hawn
O
.
P
earce
Use extended SHA1 syn
t
ax in merge-rec
u
r
sive conflicts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn
O
.
Pearce
Do
n
't crash during r
e
pack of a ref
l
og wi
t
h
pruned c
o
mmits
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Sha
w
n O
.
Pearce
Introduce a global
level w
a
rn() function
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn O
.
Pearce
Renam
e
imap
-
send's
internal info/warn functions
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pe
a
rc
e
S
u
ggest 'add' i
n
am/revert/cherry-pi
c
k
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-17
S
haw
n
O
.
Pearce
D
e
f
aul
t
GIT_COMMITT
E
R_N
A
ME to login name in reciev
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Align section h
e
aders o
f
'git status' to ne
w
'git add
'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Sh
a
wn O
.
Pearce
Suggest us
e
of "git
a
dd file1
f
i
le2" when there
i
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
S
ha
w
n O
.
Pearce
Teach bash the
n
ew f
e
atures of 'git show'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pe
a
rce
Enable reflogs by
default in any reposito
r
y with a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
P
e
arc
e
Pro
v
ide more meaning
f
ul outpu
t
from 'g
i
t init-d
b
'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pea
r
c
e
A
void accessing a slow working copy during diffcore
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-14
S
ha
w
n O
.
Pearce
By
p
a
ss expensive con
t
ent co
m
p
a
rsion dur
i
ng rename
det
e
cti
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-11
S
h
a
wn O
.
P
ea
r
c
e
Make sure the empty tree
e
x
i
sts whe
n
needed i
n
m
e
r
ge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Sha
w
n O
.
Pearce
Fix broken bash compl
e
tion of l
o
cal refs
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
P
ea
r
c
e
Teach bash how to compl
e
te long options for
g
it-c
o
mmi
t
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
earce
Te
a
ch bash
abou
t
git-am/gi
t
-ap
p
ly a
n
d
their white
s
pac
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Cac
h
e the
list of
m
erge strategies and av
a
ilab
l
e comm
a
nds
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
earc
e
Sup
p
ort --str
a
tegy=x completion in addition to --strategy x
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
ce
T
each bas
h
a
b
out
git-repo-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearc
e
Support bash completio
n
of
r
efs/remote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bas
h
abou
t
git
l
og/
s
how
/
whatchanged o
p
tions
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pe
a
r
ce
Teach b
a
sh
h
ow to
co
m
plete
g
it-rebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pear
c
e
Teach
b
ash how to complete git-cherry-pick
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
haw
n
O
.
Pearce
T
e
a
ch bash how
t
o
complete gi
t
-f
o
rmat-patch
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pearce
Add current bra
n
ch
i
n PS1 support to
g
it
-
completion
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
T
each b
a
sh how to complet
e
options
for git-name
-
rev
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pearc
e
Hide plumbin
g
/tr
a
nspo
r
t comma
n
d
s from bash completion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn
O
.
P
ear
c
e
Teach git
-
completion
.
bash how to complete git-m
e
rge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pear
c
e
Remove
more sed in
v
ocations
from within bash completion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Support b
a
sh completion on s
y
mm
e
tr
i
c diff
e
rence
operator
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Take --git-
d
ir into co
n
si
d
erat
i
on
dur
i
ng bash completi
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
S
h
awn O
.
Pe
a
rce
Bash
c
o
mple
t
i
on support for
r
emotes in
.
gi
t
/confi
g
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
P
e
arce
Only load
.
exe
s
uffi
x
'd compl
e
tio
n
s on Cygwin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn
O
.
Pearce
A
dded m
i
ssing
completi
o
ns f
o
r show-branch a
n
d
m
erg
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sh
a
wn
O
.
Pearc
e
Rem
o
v
e uns
u
pported C99 sty
l
e
struct initializers in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sha
w
n
O
.
P
e
arce
Remove
S
I
MPL
E
_
P
R
OGRAMS and make git-daemon a n
o
rm
a
l
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sha
w
n
O
.
Pear
c
e
Use ULONG_MA
X
rather than impli
c
it cas
t
o
f -1
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn
O
.
Pearce
Add
e
d bash co
m
pletion
s
up
p
ort for git-
r
eset
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
S
hawn O
.
P
earce
A
d
d
ed com
p
letio
n
s
u
p
po
r
t for git-br
a
nch
.
exe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree