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
Shawn O
.
Pe
a
rce
bas
h
: Supp
o
rt --add
completio
n
to
g
it-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn
O
.
Pearce
bash: H
i
d
e
git-resolve,
i
ts
de
p
recated
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shaw
n
O
.
Pearce
bash: Offer -
-
prune
c
o
mplet
i
on for
g
it-gc
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn
O
.
Pearce
b
a
sh: Hid
e
diff-
s
tage
s
fr
o
m
completi
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn
O
.
Pearce
bash: Suppo
r
t
c
ompletion on g
i
t-c
h
e
rry
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn O
.
Pea
r
c
e
Show an example of
d
e
leting commi
t
s with g
i
t-reb
a
se
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
bash:
S
u
p
port inte
r
nal revlist opti
o
ns
b
etter
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pe
a
rce
bash: Support uniq
u
e completion when possib
l
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Sh
a
w
n O
.
P
e
arce
bash: Support uniqu
e
completion
o
n git-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn
O
.
P
e
arce
b
a
sh: Classify more commends out
o
f completion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
ba
s
h: Add space a
f
t
e
r
u
n
ique command name is
completed
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
bash
:
C
o
mplete long
optio
n
s to git-
a
d
d
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
b
ash: Classify cat-fi
l
e and reflog
as plumbing
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
bash: Remove s
h
ort option completions for branch/checkout
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
Default GI
T
_
M
ERG
E
_VERBOSITY to 5 during te
s
ts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn
O
.
Pearce
K
eep untrac
k
e
d
fi
l
e
s
not i
n
volved
in a
m
e
r
ge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
C
leanup sub
c
ommand do
c
u
m
e
ntation f
o
r git-remote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-03
Shawn O
.
Pearce
Don't leak file descript
o
rs from
u
navailable
pack files
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn O
.
P
e
a
r
c
e
Don't
f
ind
o
bjects in packs whic
h
aren't available
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
S
h
a
w
n O
.
Pearce
R
efacto
r
o
p
e
n_packed_git to retur
n
an error c
o
de
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
S
hawn
O
.
Pearce
Correct comment
i
n prepar
e
_p
a
cked_git_one
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn O
.
Pear
c
e
Clea
n
u
p
prepa
r
e_packed_git_one to reuse
ins
t
al
l
_packed_git
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shaw
n
O
.
Pe
a
r
c
e
T
e
a
ch 'git remote' how to c
l
e
a
nup stale tracking
b
r
a
nches
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Sha
w
n O
.
P
ear
c
e
P
ull out remo
t
e list
i
ng
functi
o
ns
in
g
it-remote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-31
Shawn O
.
P
e
arc
e
Escape --up
l
oa
d
-p
a
ck from
e
xp
r
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-31
Sha
w
n
O
.
Pea
r
ce
Don't coredump on bad refs i
n
update-server-info
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-28
Sha
w
n O
.
P
e
arce
Teach for-each-ref about a little langu
a
ge called Tcl
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-28
Shawn
O
.
Pearce
Compute acc
u
rate distan
c
es in git-describe be
f
ore output
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-28
S
hawn O
.
Pe
a
rce
Teach git-des
c
ribe to display d
i
stances from
t
a
gs
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
Shawn
O
.
Pearce
R
e
m
o
v
e unne
c
essary
f
ound variable fr
o
m descr
i
be
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-18
Shawn O
.
Pearce
Document pack
.
id
x
f
ile forma
t
upgr
a
de s
t
rategy
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-18
S
h
awn O
.
P
earc
e
Refer
users to git-re
v
-parse for r
e
vis
i
on specificati
o
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-18
Shawn O
.
P
earce
Document the master@{n} reflog qu
e
ry syntax
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
S
h
awn
O
.
Pearce
Use nice names in conflict markers during cher
r
y-pick
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn O
.
Pearce
Remove hash in git
-
describe in favor of util slot
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn O
.
Pearce
Corre
c
t
p
riority of l
i
gh
t
weight tag
s
i
n
git-describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
S
h
awn O
.
Pear
c
e
Imp
r
ove git-describe per
f
ormance by re
d
uc
i
n
g revision
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
S
hawn
O
.
Pe
a
rce
Use binary searchin
g
on la
r
ge buckets in git-describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
S
h
a
w
n O
.
Pea
r
ce
H
a
sh tags by commit S
H
A1 in git-describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Sh
a
wn O
.
Pearce
A
lways
p
e
r
fer
a
nnota
t
ed tags in git-descri
b
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
S
h
a
w
n O
.
Pearc
e
Conve
r
t output me
s
sages in
m
e
r
ge-recursive to past
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
S
h
awn O
.
Pearce
Display a pro
g
ress
mete
r
d
u
ring merge-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Shawn O
.
Pearc
e
E
nable output bufferi
n
g
in mer
g
e-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
S
ha
w
n O
.
Pearce
Allow
t
he user to control the ver
b
osity of merge-recurs
i
ve
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Shawn O
.
Pearce
R
e
move unnecessary call_d
e
pth
p
a
r
a
meter in m
e
rge-recurs
i
ve
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Shaw
n
O
.
P
earce
Remove read_o
r
_die in favor of b
e
tte
r
error me
s
sage
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Shawn
O
.
Pearce
H
i
d
e ou
t
put about SV
N
:
:Core
n
ot being fou
n
d dur
i
ng
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-12
Shawn
O
.
Pearce
C
h
ose b
e
tter
t
ag names in git-describe
after
m
erge
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
S
hawn O
.
Pearce
Improve
merge pe
r
formanc
e
by avoiding in-index merg
e
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn O
.
Pea
r
ce
Disallow workin
g
dir
e
cto
r
y commands in a bare re
p
o
s
ito
r
y
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn O
.
Pe
a
rce
Make git
-
d
e
sc
r
ibe a
b
uiltin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn O
.
Pe
a
rce
Don't save t
h
e
c
ommit buffer in gi
t
-describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Sha
w
n O
.
Pearce
Don't die in git
-
http-
f
et
c
h
w
h
e
n
f
etching p
a
cks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-06
Shawn O
.
Pe
a
r
ce
Increase pac
k
edGit
{
Limit,WindowSize} on 64
bit
s
ystems
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Add t
e
s
t
c
a
s
e f
o
r update hooks in receiv
e
-pa
c
k
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Update
p
ackedGit config option d
o
cument
a
t
i
on
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pea
r
ce
Teach Gi
t
how to
p
a
r
s
e
standard
p
ower of 2
suf
f
ix
e
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Use /dev/null f
o
r upda
t
e
h
o
ok stdin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
S
h
awn O
.
Pearce
Redirect upd
a
te hook
s
tdout to stderr
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Remove unneces
s
a
r
y argc paramet
e
r from ru
n
_command_v
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
S
h
awn O
.
P
earce
Au
t
oma
t
ically
d
etect a bare git
r
eposito
r
y
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn
O
.
Pearce
Replace "GIT_DIR" with GIT_DIR_ENVIRONM
E
NT
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
U
s
e
PATH_MAX constant
for --bar
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Sh
a
wn
O
.
Pearce
Fo
r
ce
core
.
filem
o
de
t
o false on
C
y
g
win
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pe
a
rce
Fix random segfaults
in p
a
ck-obje
c
ts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shaw
n
O
.
Pearce
Cleanup read_cache_from err
o
r
h
andling
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sh
a
wn O
.
Pear
c
e
Rep
l
ace mmap with xmm
a
p, better handling MAP_FAILED
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Release pack windows be
f
ore repor
t
ing out of
me
m
o
r
y
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shaw
n
O
.
Pea
r
ce
Default core
.
p
ac
k
dGitWindow
S
ize to 1
M
iB if
N
O_MMAP
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
hawn O
.
Pearce
Test suite
f
or sliding wi
n
dow m
m
ap implementati
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pe
a
rce
C
reate pack_report() a
s
a deb
u
gging
a
id
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pe
a
rce
Su
p
p
o
r
t
unma
p
ping w
i
nd
o
ws on 'temporary' pa
c
kfiles
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
I
m
pr
o
ve err
o
r
m
e
ss
a
ge when packfile
m
m
ap fails
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Ensure
c
ore
.
p
ackedGitWindo
w
Size
c
a
nn
o
t be less tha
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
ha
w
n
O
.
P
e
a
rce
Load core configuration
in git-v
e
rif
y
-
pac
k
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pe
a
rc
e
F
ully activat
e
t
h
e sliding w
i
ndow pack
acc
e
ss
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
h
a
w
n O
.
Pearce
Un
m
ap individual windows rath
e
r than entire
f
iles
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
h
awn O
.
Pearce
Docume
n
t wh
y
header p
a
rsing
won't
e
xce
e
d
a
window
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
L
o
o
p over pa
c
k_wi
n
dows when
inf
l
ating
/
access
i
ng
d
ata
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Replace
u
se_packed
_
git w
i
th window
c
ursors
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
earce
Refactor
h
o
w w
e
open pack files to prepare for
m
ultiple
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sh
a
wn
O
.
Pe
a
rc
e
Create read
_
o
r
_die utility rout
i
ne
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pearce
U
s
e off_t for
inde
x
and pack file lengths
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pearce
Refactor packed_
g
it to prepare for slidin
g
mma
p
wind
o
ws
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pear
c
e
Introduce
n
ew config option
f
or
m
ma
p
limit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Rep
l
ace un
p
ack_entry_gently with unpa
c
k_entry
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Use merg
e
-recursive in
git-am
-3
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shaw
n
O
.
Pear
c
e
Al
l
ow
m
erging
b
are tre
e
s in
merge-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Move better_bra
n
ch_name above g
e
t_
r
ef in merge-recursi
v
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
S
h
awn O
.
Pea
r
ce
Allow git-merge to select the default st
r
ategy
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shaw
n
O
.
Pearce
Honor pull
.
{twohead,oc
t
opus}
in g
i
t-m
e
rge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
S
h
awn O
.
Pearce
Ensure `
g
it-pull` fa
i
ls if `git-merge`
f
ails
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
S
hawn O
.
Pearce
Use branch na
m
e
s
in 'git-rebase
-m' conflict hunks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pea
r
ce
Honor GIT_RE
F
L
OG_ACTION in
g
i
t-rebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
S
hawn O
.
P
earce
Use
GIT
_
REFLOG_ACT
I
ON environ
m
ent var
i
a
ble
inst
e
ad
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-27
S
h
a
wn O
.
Pearce
Create 'gi
t
gc' to perform comm
o
n maintenance opera
t
i
o
n
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shaw
n
O
.
Pearce
Switch git_mma
p
to use pr
e
ad
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
P
ear
c
e
Rename gitfake
m
map to git_mmap
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
P
e
arce
Display
'
theirs' branch name when
possible in merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pearce
Use exten
d
ed SHA
1
synta
x
i
n merge-re
c
ursive conf
l
icts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next