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
bash: Support --add completion to git-config.
2007-02-05
S
h
awn O
.
Pear
c
e
bash: Support --add comp
l
et
i
on to g
i
t-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn
O
.
P
e
arce
bash: Hide
g
i
t
-res
o
lve, its deprec
a
ted
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
S
haw
n
O
.
Pearce
bas
h
: Offer --prune com
p
letion fo
r
git-gc
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn
O
.
P
ea
r
ce
b
a
sh: H
i
de diff-stag
e
s from completion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Sha
w
n O
.
Pearce
bash: S
u
pport complet
i
on on g
i
t-
c
herry
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn O
.
Pearc
e
Show an exam
p
le o
f
deleting commit
s
wi
t
h git-reb
a
se
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
P
earce
bash: Support
i
nternal
r
ev
l
ist o
p
tions better
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
b
a
sh: S
u
pport uniqu
e
completio
n
when
p
ossib
l
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
bash: Suppo
r
t
unique completi
o
n
o
n git-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
S
h
aw
n
O
.
Pearce
bash: Classify more commends out
o
f comple
t
ion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pear
c
e
bash:
A
dd space after
u
n
i
que comma
n
d
na
m
e i
s
completed
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
S
hawn O
.
Pear
c
e
ba
s
h:
Complet
e
long o
p
tions to git-add
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn
O
.
Pe
a
rce
bash: Cla
s
sify c
a
t-fil
e
and reflog as p
l
umbing
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
S
hawn O
.
Pearce
bas
h
: Remove s
h
ort optio
n
c
o
mp
l
et
i
o
n
s f
o
r branch/checkout
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
Defa
u
lt GIT_MERGE_VERBOSITY to 5
d
urin
g
tests
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
P
e
a
rce
Keep
untracke
d
files not involve
d
i
n
a
merg
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Sha
w
n O
.
P
earce
Cleanup subcommand documentation for git-remote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-03
S
h
awn O
.
P
e
arce
Don't le
a
k f
i
le descript
o
rs fr
o
m unavailable p
a
ck
f
iles
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn
O
.
P
e
a
r
c
e
D
on't find o
b
jects
i
n
packs which aren't available
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Sh
a
wn
O
.
Pearce
Refactor op
e
n_packed_gi
t
to r
e
turn an er
r
or code
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn O
.
Pearce
Cor
r
ect commen
t
i
n
prepare_
p
acked_git_one
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn O
.
Pearce
Cleanup
p
r
e
pare_p
a
cked_
g
it_one
t
o reuse
i
nstall_packe
d
_git
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Sha
w
n O
.
Pea
r
ce
Tea
c
h
'gi
t
remote' how to cl
e
an
u
p s
t
ale t
r
acking bra
n
ches
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn
O
.
Pearce
Pull out r
e
mote li
s
ting
func
t
ions in git-remote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-31
S
hawn O
.
Pearce
Esca
p
e
--u
p
load-pack from exp
r
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-31
Shawn O
.
Pe
a
r
c
e
D
o
n't co
r
edump
on bad r
e
fs in updat
e
-serv
e
r-info
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-28
Shawn
O
.
Pear
c
e
Teach for-
e
ach-ref ab
o
ut a little
l
a
nguage calle
d
Tcl
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-28
Shawn O
.
Pearce
Compu
t
e accurate dist
a
nces in git-
d
es
c
r
ibe
b
efo
r
e output
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-28
Sh
a
wn O
.
Pearce
Teach git-describe
to d
i
spl
a
y distances fro
m
tags
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
Shawn O
.
Pearce
Remove un
n
ecessary found va
r
iable from describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-18
Shawn O
.
Pearce
Document pack
.
i
dx
f
ile format
upgrade strategy
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-18
Sh
a
wn O
.
Pear
c
e
R
ef
e
r users to git-
r
ev-parse fo
r
re
v
isi
o
n specific
a
tion
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-18
S
h
awn O
.
Pearce
Documen
t
the master@{n} r
e
flog que
r
y syntax
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shaw
n
O
.
Pearce
Use nice n
a
mes in co
n
fli
c
t markers
d
u
rin
g
cherry
-
p
i
ck
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn O
.
Pearce
Remove
h
ash
in g
i
t-descri
b
e in
favor of util slot
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn O
.
Pe
a
rce
Co
r
rect priority
of lightweight
t
ags
in
g
it
-
des
c
r
ibe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn
O
.
Pearce
Improve git-des
c
ribe performance by reduci
n
g revision
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Sh
a
wn O
.
Pear
c
e
Use binary sear
c
hing
on large buckets in
g
it-describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
S
h
awn O
.
P
e
ar
c
e
Hash tags by commit SHA1 in git-describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shaw
n
O
.
Pe
a
rce
Always p
e
rfer annotate
d
tags in git-
d
escribe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Shawn
O
.
Pearce
Convert output me
s
sages in
m
erg
e
-recursive to
p
ast
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Shawn O
.
Pearce
Dis
p
lay a progress me
t
er d
u
ring mer
g
e-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Shawn
O
.
Pearce
E
n
able outpu
t
buffering in
merge-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
S
h
a
wn O
.
Pea
r
ce
Allow the user t
o
c
o
ntro
l
the ve
r
bosity
o
f me
r
ge-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
S
h
a
w
n O
.
Pea
r
ce
R
emove
u
nnecessar
y
c
a
l
l_
d
epth parameter in
merge-recursi
v
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
S
h
awn O
.
Pearce
Remo
v
e read
_
or_die
i
n
f
a
vor of better e
r
ror
m
ess
a
g
es
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Sha
w
n O
.
P
e
arce
Hi
d
e
ou
t
put about SVN::Core not being found during
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-12
Sh
a
wn O
.
Pearce
Chose better tag names in gi
t
-des
c
ribe
a
f
ter
m
erges
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Sh
a
wn O
.
Pearce
Improve merge
performance by a
v
oidin
g
i
n-index mer
g
es
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
S
h
a
w
n O
.
Pearce
Disa
l
low working dire
c
tory commands
in a bare
r
e
p
osito
r
y
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Sha
w
n O
.
Pe
a
rce
Make
git-describe a
bu
i
lti
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn O
.
Pearce
Do
n
't save th
e
com
m
it buffer
in git-de
s
cribe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Sh
a
wn
O
.
Pear
c
e
Don'
t
die
in git
-
http-fetch when fetching p
a
c
ks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-06
Shawn O
.
P
e
arce
Increa
s
e packedGit{Limi
t
,Wind
o
wSize
}
o
n 64 bit sys
t
ems
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
P
ea
r
ce
Add test case
f
or updat
e
hoo
k
s
i
n r
e
ceiv
e
-pack
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Sh
a
wn O
.
P
ea
r
ce
Update p
a
ckedGit c
o
nfig
opt
i
on
d
ocumentation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Teach Git ho
w
to parse
s
t
a
nd
a
rd power of 2 suffixes
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Use /dev/
n
u
l
l for update hook stdin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Sha
w
n O
.
Pearce
Redir
e
ct update hook
stdo
u
t to std
e
r
r
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
P
e
arce
Remove unnecess
a
ry argc parameter f
r
om run_co
m
mand_
v
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Automatically
d
etec
t
a
bare g
i
t
r
eposito
r
y
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
S
hawn O
.
Pe
a
rc
e
Replace
"GIT_DIR
"
with
G
I
T_DIR_ENVIRONMENT
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Sha
w
n O
.
Pear
c
e
U
se PATH_MAX
c
onstant for -
-
bare
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pe
a
rce
F
o
rce core
.
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-objec
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Cleanup rea
d
_cache_fro
m
error handling
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pearce
Replace mmap with xmmap
,
b
ette
r
hand
l
ing MAP_
F
AI
L
ED
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
e
arce
Rele
a
se pack win
d
ow
s
be
f
o
r
e
r
eporting out o
f
memory
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pearce
Default
c
ore
.
p
a
ckdGitWindowSi
z
e
to 1 MiB
if NO_MMAP
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sha
w
n O
.
Pearce
Test suite for slidi
n
g window mmap implementatio
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Create pack_report() as
a
d
ebugging aid
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pearce
Sup
p
ort unmapping
windows
o
n
'temporary'
p
ack
f
i
les
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
hawn O
.
Pearce
Improve error message w
h
e
n
packfile mmap fails
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
E
n
sure core
.
packedG
i
tWindowSize cannot be les
s
th
a
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Lo
a
d core
conf
i
guration in git-
v
erify-pack
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Fully activat
e
th
e
sliding window pack a
c
ces
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sh
a
w
n O
.
Pearce
Unm
a
p in
d
i
v
id
u
al windows rather th
a
n e
n
ti
r
e
f
iles
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
h
awn O
.
Pearce
Doc
u
ment why header
parsing won't exce
e
d a window
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shaw
n
O
.
Pearce
Loop over pa
c
k_win
d
ows when inflating/accessing data
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearc
e
Repla
c
e use_packed_git with window cursor
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Refa
c
t
o
r how we open pack
f
iles to prepare for multiple
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Crea
t
e
r
ead
_
or_die utility rout
i
ne
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shaw
n
O
.
Pearce
Use
o
ff_t for ind
e
x and pa
c
k fi
l
e lengths
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pea
r
ce
Refactor packe
d
_git to prepa
r
e for slid
i
ng mmap
window
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
e
arce
Intro
d
uc
e
new config
o
pti
o
n
for m
m
ap limit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Replace unpack_entry_
g
e
n
tl
y
wit
h
unpack_entry
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pear
c
e
U
se merge-r
e
cursive in git-a
m
-3
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sha
w
n O
.
Pe
a
rce
Allow merging
bare trees in
merge-recur
s
ive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
e
arce
M
o
ve bette
r
_branch
_
na
m
e a
b
ov
e
get
_
ref in m
e
r
g
e-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Al
l
ow git-merge
t
o
s
elect
the default strategy
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
S
h
awn O
.
Pearce
Honor
p
ull
.
{twohead,octopu
s
} in git
-
me
r
ge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Ensu
r
e `git
-
pull` f
a
ils
i
f
`git-merge` fails
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn O
.
Pearc
e
Us
e
branch names in 'git-
r
ebase -m' c
o
nflict hunks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shaw
n
O
.
P
e
ar
c
e
Hon
o
r G
I
T_REFLOG_ACTION
in gi
t
-rebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shaw
n
O
.
Pearce
Use GIT_RE
F
LOG_ACTION environment var
i
a
ble in
s
tead
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pe
a
rce
Create 'git gc' t
o
pe
r
form
c
ommon ma
i
ntenance operatio
n
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
S
h
aw
n
O
.
P
e
arce
Switch
git_mmap to use pr
e
ad
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearce
Rename
gitfa
k
emmap
to git_mm
a
p
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn
O
.
Pea
r
ce
D
ispl
a
y 'theirs' branc
h
name
w
hen
possible in mer
g
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Sh
a
wn
O
.
Pe
a
rce
Use
e
xtended SH
A
1 synta
x
in
merge
-
recursive
c
onflic
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next