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
t9200-git-cvsexportcommit.sh: quiet down commit
2006-12-28
S
h
awn O
.
Pea
r
ce
Allow git-me
r
ge to select the default stra
t
egy
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shaw
n
O
.
Pearce
Honor pul
l
.
{twohead,o
c
to
p
us} in git-merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
E
nsure `git-pull` fails if `git-merg
e
` f
a
ils
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
S
h
awn O
.
Pe
a
rce
U
s
e
branch n
a
m
e
s in
'
git-rebase
-
m' con
f
lict hunks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Ho
n
or GIT_REF
L
O
G_ACTION in git-rebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn
O
.
P
ear
c
e
Use GIT_REFLO
G
_ACTIO
N
environment
variable instead
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pearce
Cr
e
ate 'git g
c
' to perform co
m
m
o
n maintenanc
e
operations
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
S
haw
n
O
.
P
earce
Swit
c
h git_mmap to use pread
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearc
e
R
e
name git
f
akemma
p
to git_mma
p
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn
O
.
Pearce
Disp
l
ay 't
h
eirs
'
branch
n
ame
when possible
in
m
erge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
P
ea
r
ce
Use exten
d
e
d
SHA1
s
yn
t
ax in m
e
rge-
r
ecurs
i
ve c
o
nflicts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Don't crash d
u
ring repack o
f
a reflog w
i
th pru
n
ed commi
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn
O
.
Pearce
In
t
roduce a global level warn() function
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
w
n O
.
Pe
a
r
c
e
Rename imap-send
'
s internal
i
nfo/warn
functions
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Suggest 'add'
i
n
am/re
v
ert/cherry-pick
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-17
Shawn O
.
P
ea
r
ce
Default GIT_COMMITTER_NAME t
o
lo
g
in name in recie
v
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Sha
w
n O
.
Pearce
Alig
n
section headers o
f
'git statu
s
' to n
e
w
'
git
ad
d
'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pe
a
rce
S
ugges
t
use
of
"
git add fi
l
e1
file
2
" when there
i
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Teach bash the
n
ew featur
e
s
of 'git show'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
P
e
arce
Ena
b
le reflogs by def
a
ult in any
repo
s
itory with a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
P
r
ovi
d
e more
m
eaningful o
u
tput from 'gi
t
init-db'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shaw
n
O
.
Pea
r
ce
Avoid acc
e
ssi
n
g a
s
low w
o
rking copy during diffcore
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-14
Sh
a
wn O
.
Pearce
Bypass
e
x
p
ensive content comparsion
during rename detection
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-11
Shawn O
.
Pearce
Make sure the e
m
pty tree exists when needed in
merge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Shawn
O
.
Pear
c
e
Fix
b
roken
b
ash
completion of local ref
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Sha
w
n
O
.
Pearce
T
e
a
ch bash how to comple
t
e long
opt
i
ons for gi
t
-commit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bas
h
about git-am
/
git-apply and their whitespace
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearc
e
Cache the list of me
r
ge strate
g
i
es and a
v
ailab
l
e c
o
m
m
an
d
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pearc
e
Support -
-
s
trategy=x completion in
a
dd
i
tion to --str
a
tegy x
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach ba
s
h about git-repo-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Support bash completion of refs/remote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pearce
Teach
ba
s
h
ab
o
ut git
log/show
/
w
ha
t
changed options
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
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
S
h
awn O
.
Pearce
Teac
h
bash how to complete
g
it-cherry
-
pick
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pe
a
rc
e
T
each bash how
to comp
l
et
e
git-for
m
at-patch
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n
O
.
Pearc
e
Add current branch in PS1 support to git-c
o
mpletion
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pearce
Teach
b
ash
h
ow to c
o
mple
t
e options for g
i
t
-name-rev
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Hide plumbing/
t
ransport commands from ba
s
h comple
t
ion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pearce
T
e
ach git-
c
om
p
letio
n
.
bash how to complete git-
m
erg
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearc
e
R
emove more sed invocat
i
o
n
s from within bash comple
t
i
on
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
P
e
arce
S
upp
o
rt bash com
p
letion o
n
symmet
r
i
c
dif
f
e
r
ence operator
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
S
h
a
w
n
O
.
Pearce
T
a
ke --
g
it-dir into
consideration during bash com
p
le
t
ion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Ba
s
h completion
s
uppo
r
t fo
r
r
e
mot
e
s i
n
.
g
i
t/config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn
O
.
Pearce
Only load
.
e
x
e
suffi
x
'd completions on Cyg
w
in
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn
O
.
Pea
r
ce
Adde
d
mis
s
ing completions for show-branch and
m
erg
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sh
a
wn O
.
P
e
arce
Remo
v
e unsup
p
orted C99 style struct init
i
alizers
i
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Remove SIMPLE_PROGRAMS and m
a
ke git-daemon
a
normal
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pear
c
e
Use ULONG_M
A
X
rather
than imp
l
icit
c
a
s
t of
-1
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shaw
n
O
.
Pearce
A
dd
e
d b
a
sh completion support for git-reset
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
A
dded completion
support f
o
r git
-
branch
.
exe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree