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
Ensure `git-pull` fails if `git-merge` fails.
2006-12-28
Shawn O
.
Pearc
e
Ensure `git
-
p
u
ll` fails if
`
gi
t
-
m
erge` fa
i
l
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
P
e
a
rce
Use bra
n
ch nam
e
s in 'gi
t
-
r
ebase -m
'
c
o
nfli
c
t hunk
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn O
.
Pearc
e
Hono
r
GIT_REFLO
G
_ACTION in git-reb
a
se
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pe
a
rce
Use GI
T
_REFLOG_ACTI
O
N envir
o
nment variable instead
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
P
e
arce
Create 'git gc' to perform com
m
on maintenance oper
a
tions
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn
O
.
Pear
c
e
Swi
t
c
h git
_
mmap
t
o use prea
d
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
S
h
a
w
n O
.
Pea
r
ce
Rena
m
e
g
itfakemmap to g
i
t_mmap
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
P
earce
Disp
l
ay 'theirs' branch name wh
e
n
p
ossib
l
e in
me
r
ge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
S
h
awn O
.
Pear
c
e
Us
e
ex
t
ended SHA1 syntax in mer
g
e-recursive conflicts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pea
r
ce
Don't
crash during repack
o
f a r
e
flog with pruned comm
i
ts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn O
.
P
earce
In
t
r
o
d
uce a
g
lobal level wa
r
n() function
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn O
.
Pearce
Renam
e
imap-s
e
nd's
i
nternal info/warn function
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pe
a
rce
Sugges
t
'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
.
Pe
a
r
ce
Default
G
IT_COMMITTER
_
NAME to login name
i
n recieve
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
S
h
a
wn O
.
Pearc
e
Alig
n
sec
t
ion headers of 'g
i
t
status'
t
o new
'git add'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
S
h
awn O
.
Pearce
Suggest use of "git add f
i
l
e1
f
il
e
2" wh
e
n the
r
e
is
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Sha
w
n O
.
Pearce
Teach bash the ne
w
features of
'git sh
o
w'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Enabl
e
reflogs by
d
efault in
any re
p
osit
o
r
y
with
a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shaw
n
O
.
Pearce
Pro
v
i
de more meaningful o
u
tput fr
o
m 'g
i
t init-
d
b'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
P
e
a
rce
Avoid accessing a slow
work
i
ng copy
du
r
ing diffcore
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-14
Shawn O
.
Pearce
Bypass expen
s
ive
c
ont
e
nt
c
ompa
r
s
i
on
d
u
ring
rename detectio
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-11
Shawn O
.
Pe
a
rce
Ma
k
e sure
the e
m
p
t
y tree
e
xists when needed in merge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearce
Fix b
r
o
ken bash co
m
p
leti
o
n of local
r
e
f
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Shaw
n
O
.
Pea
r
ce
Teach bash how to complete long opt
i
ons for git-commit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash about gi
t
-am
/
git
-
ap
p
ly
and th
e
ir whitespace
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
w
n O
.
Pearce
Cache the l
i
st of merge s
t
ra
t
egies
a
n
d available
commands
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arce
Support --st
r
ategy=
x
com
p
letion in addition to -
-
s
t
rate
g
y
x
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
w
n
O
.
Pearce
Teach bash a
b
out
git-repo-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn
O
.
Pearce
Supp
o
rt bash completion of
refs/
r
emote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
earce
Teach bash
about git
l
og/sh
o
w/wh
a
tchan
g
ed o
p
tions
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
a
rce
Te
a
ch
bash ho
w
to co
m
pl
e
te
git-rebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pearce
Teach ba
s
h how to compl
e
t
e g
i
t
-
c
herry-pick
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pear
c
e
T
e
ach bash how to
c
omplete git-format-pat
c
h
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
A
d
d
c
u
rre
n
t
bra
n
ch i
n
PS1 support to git-co
m
pl
e
tion
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Teach
b
ash
how to
c
omplete
o
ptions for git-
n
ame-rev
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
P
e
arce
H
i
de p
l
u
m
bing
/
transport c
o
mmands from bash completion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arce
Teach g
i
t-completion
.
bas
h
how to
complete git-merg
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sh
a
w
n O
.
Pearce
Remove more se
d
invocations fr
o
m wit
h
in bash com
p
l
e
ti
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sh
a
wn O
.
Pear
c
e
Support
b
a
s
h complet
i
on on symme
t
ric
d
iffe
r
ence
o
per
a
tor
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sh
a
wn O
.
Pea
r
ce
Take --git-dir
i
nto considera
t
ion during
b
a
s
h completi
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pea
r
ce
B
a
sh completion support
f
or remotes in
.
git/config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pe
a
rce
Only load
.
e
xe suffix'd completions on Cygwin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pe
a
rce
Added mi
s
s
i
n
g completions for show-branch a
n
d merge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
P
earce
Remove u
n
supported C99 style struct initializers in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shaw
n
O
.
Pearce
R
emo
v
e SIMPLE_
P
ROGRAMS
a
nd make git-dae
m
on a normal
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sha
w
n
O
.
Pearce
Use ULONG_
M
AX rather th
a
n implicit cast of
-
1
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
S
h
awn O
.
P
earce
Added bash
co
m
pletion suppo
r
t f
o
r git-
r
e
s
et
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sh
a
wn O
.
Pe
a
rce
Added c
o
mpl
e
t
ion
s
uppo
r
t for git-branch
.
exe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree