repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: minor rewording for git-log and git-show pages.
2006-12-28
Shawn
O
.
Pearce
Allow git-mer
g
e to select the default st
r
ategy
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Hono
r
pull
.
{twohead,octop
u
s} in git-merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearc
e
En
s
ure `git-
p
u
l
l` fails
if `git-merge
`
fails
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn O
.
Pearce
U
s
e
b
ranch
n
ames in
'
git-
r
e
b
as
e
-m' co
n
flict hunks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn O
.
Pearce
H
o
nor G
I
T_REFLOG
_
A
C
TION in git-rebas
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn
O
.
Pearce
U
s
e
G
I
T_REFLOG_ACTION en
v
ironment varia
b
le instead
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-27
S
hawn O
.
Pe
a
rce
Cre
a
te
'git gc' t
o
perform common maintena
n
ce o
p
e
ratio
n
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn
O
.
P
e
arce
Switc
h
git_
m
m
ap
to u
s
e pread
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearce
Re
n
ame gitfakemmap to
git_
m
map
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pearce
Display '
t
h
eirs' branch name whe
n
p
ossibl
e
i
n merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
S
h
awn O
.
Pe
a
rce
Use extended SHA
1
synt
a
x i
n
merge-recursive c
o
nflic
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pear
c
e
Do
n
'
t
cras
h
during repack
o
f
a reflog wit
h
p
r
uned
c
o
mmi
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn O
.
Pea
r
ce
Introduce a gl
o
bal level
warn() function
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
S
hawn O
.
Pe
a
rce
Rename imap-send's internal info/warn functions
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Suggest 'ad
d
' in am/revert/cherry-pick
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-17
Sh
a
wn O
.
Pe
a
rce
D
efault G
I
T
_
C
OMMITTER_NAME to login name in reci
e
ve
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Sh
a
wn O
.
Pearce
Align s
e
cti
o
n headers
of
'
git status
'
t
o new 'git add'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Sha
w
n O
.
Pearce
Suggest use of "git add
file1 file2" when
t
here is
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Sh
a
w
n O
.
Pe
a
rce
Te
a
c
h
bas
h
the new
f
eatures
of 'git show'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
S
h
awn O
.
Pe
a
rce
Enab
l
e reflogs
by
default in a
n
y
r
e
po
s
itor
y
with a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
P
earce
P
ro
v
ide more meaningful outpu
t
from '
g
it in
i
t-db'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Sha
w
n O
.
Pearce
Av
o
id
a
ccessing
a
s
low wo
r
k
ing
co
p
y d
u
ri
n
g diffco
r
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-14
Shawn O
.
Pearce
B
ypas
s
exp
e
nsive content comparsio
n
during re
n
ame detection
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-11
S
hawn O
.
Pearce
Make su
r
e the empty tree exists when nee
d
ed in merge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pear
c
e
Fix broken bash completio
n
of local ref
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearce
Teach bash h
o
w to comp
l
et
e
long options
for git-co
m
mit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
T
e
a
c
h
ba
s
h about git-am/
g
i
t
-ap
p
ly and their whitesp
a
ce
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pearce
Cache the list of me
r
ge strategies and available c
o
mmands
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pe
a
rce
Supp
o
r
t --strateg
y
=x compl
e
tion in add
i
t
i
o
n
to
-
-strategy
x
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
w
n
O
.
P
e
arce
Teach bash about git-repo-con
f
ig
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
earce
S
upport ba
s
h compl
e
tion of refs/re
m
o
t
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Tea
c
h bash
a
bout git log/show/whatchan
g
ed options
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
wn O
.
P
e
arce
Teach bash how to c
o
mplete git-r
e
base
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearc
e
Teach
bash how to co
m
pl
e
te
g
it-cherry-pick
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
T
e
a
c
h b
a
sh how
t
o
c
omp
l
et
e
git-format-
p
a
t
ch
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Add
c
urre
n
t
bran
c
h in PS
1
support
to git-co
m
pletion
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pearce
T
e
ach bash how to compl
e
te options
f
or git-name-r
e
v
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pe
a
rce
Hide p
l
umbing/transp
o
r
t
comma
n
d
s
from bas
h
c
omple
t
ion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pearce
Teach git-completion
.
bash ho
w
to
c
omplete git-merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shaw
n
O
.
Pearce
R
emo
v
e
more s
e
d
i
n
v
ocations from wi
t
hin bash comp
l
etion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
S
h
a
w
n
O
.
Pearce
Support bash com
p
letio
n
on
s
ymm
e
tric
differ
e
nce operato
r
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Take --gi
t
-d
i
r into consideration d
u
ring bas
h
co
m
pl
e
tion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
S
hawn O
.
Pearce
Bash
completion supp
o
rt
for remotes
i
n
.
g
i
t/confi
g
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn
O
.
P
e
arc
e
Only
l
oad
.
e
x
e suffix'd completions on Cygwin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
A
dded
m
iss
i
ng comp
l
etions
f
or show-br
a
nch and m
e
rge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn
O
.
Pearce
R
e
move unsupported C99
s
tyle stru
c
t initializers in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
S
h
awn O
.
Pear
c
e
R
emove SIMPL
E
_PROGRAMS and mak
e
gi
t
-dae
m
o
n
a normal
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Use U
L
O
N
G_
M
AX
rathe
r
t
h
a
n implicit cast of
-1
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Adde
d
bash complet
i
on support for git-reset
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Added c
o
mpletion support for git-branch
.
ex
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree