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
hawn
O
.
Pearce
ba
s
h:
S
upport --a
d
d
com
p
letion to git-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn O
.
P
e
arce
bash:
Hid
e
gi
t
-
resolv
e
, its deprecated
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn O
.
Pearce
b
ash: Offer --pr
u
ne com
p
letio
n
f
o
r
gi
t
-gc
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn O
.
P
e
ar
c
e
bas
h
: Hide diff-stages fr
o
m completion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Sha
w
n O
.
P
earce
bash: Suppo
r
t completion on git-cherry
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-05
Shawn O
.
Pearce
Show a
n
example of d
e
leting co
m
mit
s
with gi
t
-reb
a
se
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
bash
:
Support
inter
n
al rev
l
ist option
s
b
etter
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
bash:
S
upport
u
niqu
e
completion w
h
en pos
s
ible
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn
O
.
P
e
arce
bash: Support unique complet
i
on on gi
t
-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
S
h
awn
O
.
Pearce
bas
h
:
C
lassi
f
y
more commends
out of
com
p
letio
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
P
e
ar
c
e
bash: Add space after unique co
m
mand name is completed
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
ba
s
h
: Compl
e
te long options to git-
a
d
d
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
bash: Classify cat-file and reflog
as plumbin
g
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shaw
n
O
.
Pearce
bash: Remov
e
short optio
n
completion
s
for b
r
anch/checkout
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Shawn O
.
Pearce
De
f
ault GIT_MERGE_
V
ERBOSITY to 5 during tests
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Sha
w
n O
.
Pearce
Kee
p
untrack
e
d
file
s
not invo
l
ved in a merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-04
Sha
w
n O
.
P
e
arce
Cle
a
nup subc
o
m
m
an
d
docume
n
t
a
tion for git-remote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-03
Shawn O
.
Pearce
Don't l
e
ak file descr
i
ptor
s
from unavailable pack files
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn O
.
Pearce
D
on't fin
d
objects in packs which aren't
availab
l
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Sha
w
n O
.
P
earce
Refa
c
tor ope
n
_packed_git
t
o retu
r
n an erro
r
code
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn O
.
Pearce
C
o
rrect co
m
ment in prepa
r
e_pa
c
k
e
d_git_
o
ne
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn O
.
Pearce
Cle
a
nup prep
a
re_packed
_
gi
t
_one to reuse install_p
a
cked_git
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn O
.
Pea
r
ce
Teach 'git remote
'
how to c
l
e
anup
stale tracking branches
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-02
Shawn O
.
Pearce
P
u
ll
out remote listing
f
unct
i
ons in
git-remote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-31
Sh
a
wn
O
.
Pe
a
rce
Escape --upload-
p
a
c
k from e
x
pr
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-31
Shawn
O
.
Pea
r
ce
Don
'
t co
r
edum
p
on bad refs in updat
e
-serv
e
r-info
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-28
S
hawn O
.
Pearce
Teach for-e
a
ch-ref about a litt
l
e language called Tcl
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-28
S
hawn O
.
Pea
r
ce
C
omp
u
t
e
accurate
d
istances in git-describe be
f
ore
output
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-28
Shawn O
.
Pearce
Teach g
i
t-describe to d
i
splay di
s
tances from ta
g
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
S
h
awn O
.
Pearce
Remove unnecessary found
variable from describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-18
Shawn
O
.
Pearce
Docume
n
t pac
k
.
idx fi
l
e forma
t
up
g
rade s
t
rategy
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-18
Shawn O
.
Pearce
Refer users to
g
it-re
v
-par
s
e
f
o
r
r
ev
i
sion
specifica
t
io
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-18
Sh
a
w
n
O
.
Pearce
Docum
e
nt the m
a
ster@
{
n
} reflog qu
e
ry sy
n
t
a
x
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn O
.
Pearce
Use ni
c
e names in con
f
l
ict m
a
rkers during
cherry-pick
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn O
.
Pearce
Re
m
ove hash
i
n
git-describe in favor of util slot
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn
O
.
Pear
c
e
Correct prior
i
ty
o
f lightweight tags in git-describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
S
h
a
wn O
.
P
earce
Improve git-describe
perfor
m
ance by
r
e
du
c
ing
r
evision
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn O
.
Pearce
U
se binary
s
earching on large
b
u
ckets i
n
g
it-desc
r
i
be
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Sha
w
n O
.
Pearce
H
a
sh tag
s
by commit S
H
A1 in git-describ
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-15
Shawn
O
.
Pea
r
c
e
Always perfer annot
a
te
d
tags in g
i
t-des
c
ri
b
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Sh
a
wn
O
.
Pearc
e
Con
v
ert output me
s
sa
g
es in merge-recursive to
p
ast
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Sh
a
wn O
.
Pea
r
ce
Display a progress meter during me
r
ge-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Shawn
O
.
Pear
c
e
Enable
out
p
u
t
buff
e
r
ing in
m
e
rge-re
c
u
r
sive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
S
ha
w
n O
.
Pea
r
ce
Allow the user to control the verbosi
t
y of
merge-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
S
h
awn O
.
Pearce
R
e
move un
n
e
c
essary ca
l
l_depth
p
a
ra
m
eter in merg
e
-
recurs
i
v
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Sh
a
wn O
.
Pearce
Remove r
e
ad_or_di
e
i
n
favor of better error mess
a
ges
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-14
Shawn O
.
Pearce
Hide 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
Shawn O
.
P
e
arce
Chose better t
a
g names in git-describ
e
afte
r
merges
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn
O
.
Pe
a
rce
Improv
e
mer
g
e performance by a
v
oidi
n
g in-
i
ndex merges
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Sh
a
wn O
.
Pearce
Disallow work
i
ng director
y
commands in
a
b
are repository
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn O
.
P
e
a
r
ce
Ma
k
e
g
it-
d
escribe a bui
l
tin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
Shawn O
.
P
earce
Don't
s
ave the c
o
mmit buffer in git-describe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-10
S
h
aw
n
O
.
Pearce
D
on't die
i
n git-
h
t
t
p-
f
e
tch when fetching pa
c
ks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-06
Sh
a
wn O
.
Pe
a
rce
Increase
p
ackedG
i
t{Limit,WindowSize
}
on 64 bit systems
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Sha
w
n O
.
Pear
c
e
Add test
case fo
r
u
pd
a
t
e
hooks in rece
i
v
e-pack
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
S
hawn O
.
Pearce
Upda
t
e
pac
k
e
dGit
config option docu
m
entation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
S
hawn O
.
Pear
c
e
Teach Gi
t
ho
w
to parse
s
tandard p
o
wer of
2 suffixes
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Us
e
/dev
/
null for update hook
s
tdi
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
S
h
awn O
.
Pearce
R
e
d
i
rect updat
e
hook s
t
dou
t
t
o
stderr
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
P
e
arc
e
Remove
u
n
n
ecessa
r
y argc
paramet
e
r from run_comm
a
n
d
_v
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
Pearce
Automatic
a
lly det
e
ct a ba
r
e git reposi
t
ory
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn
O
.
Pearce
Replace "GIT_DIR" wi
t
h GIT_DIR_ENVIRONMENT
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Shawn O
.
P
e
a
rce
Use PATH_
M
AX cons
t
an
t
for --b
a
re
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-31
Sha
w
n O
.
P
earce
Force
c
ore
.
filemode to fal
s
e o
n
Cy
g
win
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
h
aw
n
O
.
P
e
arce
Fix
random segfaults in pack-o
b
jec
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shaw
n
O
.
P
ea
r
ce
Cleanup read_ca
c
he_fro
m
e
rror han
d
ling
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
R
eplace mm
a
p
w
ith xmmap
,
bett
e
r handling MAP_FAILED
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Release pack windows before r
e
portin
g
out of mem
o
r
y
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pea
r
c
e
Default core
.
pac
k
dGit
W
in
d
o
wSize to 1
M
iB if NO_MMAP
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Test suite for sliding win
d
ow mmap implement
a
t
ion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
C
r
eate pa
c
k
_
report()
as a debugging aid
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sh
a
wn O
.
Pearce
Support unmapping win
d
ows on '
t
em
p
orary'
p
ackf
i
l
e
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shaw
n
O
.
P
earce
Improve
error
message whe
n
p
a
ckf
i
le
mmap fails
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
h
awn O
.
Pearce
Ensure core
.
packe
d
GitWi
n
d
owSize cann
o
t
be less than
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
e
a
rce
Load
core configu
r
ation i
n
git-ver
i
fy-pa
c
k
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Fully activate
t
h
e slid
i
n
g window pack acces
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pearce
Unmap individu
a
l windo
w
s rather than entir
e
files
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sh
a
wn O
.
P
e
arce
Document why header
p
ars
i
ng won't
ex
c
e
e
d
a
wi
n
dow
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pearce
Loop over pack_wi
n
d
ows when inflating/accessi
n
g data
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
P
e
arce
R
e
place use_pa
c
ked_git with win
d
o
w
c
ursors
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Sha
w
n O
.
Pear
c
e
Refactor how we open pack files to
prepare
f
or multiple
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shaw
n
O
.
Pearce
C
r
e
a
te rea
d
_or_die u
t
ility ro
u
tine
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
hawn O
.
Pearc
e
Use of
f
_t for i
n
dex and
p
ack
file len
g
ths
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
P
e
arce
Refactor packed_git to
p
repare
f
or slid
i
ng mmap
w
indo
w
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pe
a
rc
e
Int
r
oduce new
con
f
ig opt
i
on f
o
r
mmap l
i
mit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
h
awn
O
.
P
earce
Replac
e
unpack_entry_
g
ently wit
h
u
npack_entry
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
S
hawn O
.
Pearce
U
se me
r
ge-recursive
i
n git-am -3
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn O
.
Pearce
Allow me
r
g
i
n
g
b
ar
e
trees in merge-recur
s
ive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-29
Shawn
O
.
Pe
a
rce
Move bett
e
r_branch_name above get_ref in
m
e
r
ge-recursive
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
S
h
a
wn O
.
Pearce
A
l
low git-mer
g
e to select the
d
efault strategy
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Honor pu
l
l
.
{twohead,
o
ctopus} in git-merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pear
c
e
Ensure `git-pull` fa
i
l
s if `git-mer
g
e` fails
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pe
a
rce
U
se
b
ranch names in 'git-rebase -m' conflict hunks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shaw
n
O
.
Pearce
H
o
nor GIT_REFLOG_ACTION in git-rebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
P
e
arce
Us
e
G
I
T
_REFLOG_ACTION environment
variable i
n
stead
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pearce
Create
'
git gc' to perform commo
n
ma
i
nt
e
nance operations
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearce
Switch git_mmap to
use pread
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Sha
w
n O
.
P
earce
R
e
n
a
m
e gitfakem
m
ap to g
i
t_mmap
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shaw
n
O
.
Pe
a
rce
Display 'theirs
'
bran
c
h name when poss
i
ble in
merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn
O
.
Pearce
Use extend
e
d SHA1 syntax in mer
g
e
-
r
ecursive conflicts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next