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
Use branch names in 'git-rebase -m' conflict hunks.
2006-12-28
Shawn
O
.
Pearce
Use b
r
a
nch names in 'git-r
e
base -m
'
conflict hunks
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Honor GIT_REFL
O
G_ACTION in
g
it-rebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pe
a
rce
Use GIT_
R
EFLOG_
A
CTIO
N
environm
e
nt variable instead
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pearce
C
r
eate
'
gi
t
gc' to perform co
m
mon maintenance operatio
n
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn
O
.
Pearce
Switch g
i
t
_
mma
p
to use pread
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearce
Rename g
i
tfakemma
p
to git_mmap
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
S
hawn
O
.
Pea
r
c
e
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
Us
e
extended SHA1 syntax in merge
-
recursive conflicts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
S
haw
n
O
.
P
e
ar
c
e
Don't cra
s
h
d
urin
g
repack of a reflog with
pruned
commits
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shaw
n
O
.
Pearce
Int
r
oduce a
g
lobal level w
a
rn() function
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pea
r
ce
Rena
m
e imap-send's int
e
rnal info/warn
f
u
nc
t
i
ons
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn
O
.
Pearce
Suggest 'add' in am/re
v
ert/cherry-pick
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-17
Shawn O
.
Pear
c
e
Default GIT_COMMITT
E
R_NAME to login
name in recieve
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn
O
.
P
earce
Alig
n
section
heade
r
s
of 'gi
t
status' to new 'git add'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shaw
n
O
.
P
ear
c
e
Sug
g
est us
e
of
"
git ad
d
file1 file2" when
there is
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Teach bash t
h
e new
fe
a
tures
of 'git show'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Enable reflogs by defau
l
t in
any r
e
posi
t
ory with a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
S
hawn O
.
Pearce
Pro
v
i
de more meani
n
gful outpu
t
from 'git init
-
db'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Avoid accessing a slow working copy during
dif
f
core
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-14
Sha
w
n O
.
P
earce
Bypass e
x
pensive conten
t
comparsion during rename
detec
t
ion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-11
Sh
a
wn
O
.
Pearce
Ma
k
e
sure the
empty tree ex
i
sts when neede
d
i
n m
e
rge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearce
Fix b
r
oken bash completi
o
n
o
f
l
ocal refs
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearce
Te
a
ch bash how to co
m
plete long o
p
tions
for git-
c
o
m
m
i
t
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
P
e
arce
Teach bash about gi
t
-am/git-apply and their whitespace
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
Pe
a
rce
C
a
ch
e
the list of merge stra
t
e
gies and ava
i
lable
commands
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n
O
.
P
e
arce
Support --strategy=x comp
l
e
tio
n
in addition to --strat
e
gy x
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash about
git-repo
-
config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pearce
S
upport bash completi
o
n of
r
efs/
r
emote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pear
c
e
Teach
b
ash about git l
o
g/show/whatchanged options
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
ce
T
e
a
ch bash how
t
o
complete git-rebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
earce
Teach bash how to complete git-c
h
e
rry-
p
ick
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pea
r
ce
Teach bash how to comp
l
ete
g
it-format-
p
a
t
ch
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
A
dd cu
r
rent branch in PS1
sup
p
ort to
git-completion
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
a
r
ce
Teach bash how to complete o
p
tions for g
i
t-
n
a
m
e
-
rev
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Hide
p
lumbing/transport comman
d
s
f
rom bash comp
l
etion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
T
each git-completion
.
bash
how to c
o
mplete git-merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
R
emove more se
d
invo
c
ations from within bash
c
ompleti
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
S
hawn O
.
Pearc
e
Su
p
port bash completion on symme
t
ric differenc
e
o
p
erator
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
P
ea
r
ce
Take --git-dir into
c
onsideration du
r
ing bash completion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pear
c
e
Bash c
o
mpletion s
u
pp
o
rt for
r
e
m
otes in
.
git/config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Only lo
a
d
.
e
x
e suf
f
ix'd compl
e
ti
o
ns on Cyg
w
i
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Added missi
n
g com
p
letio
n
s for show-branch and merge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
P
ear
c
e
Remove
unsupported C99 style struc
t
ini
t
ial
i
zers in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shaw
n
O
.
Pearce
R
emove SIMPLE_PROGRAMS and mak
e
git-d
a
emon a normal
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sha
w
n O
.
Pea
r
ce
Use ULONG_MAX r
a
the
r
than implicit cast of -1
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Added bash completion suppor
t
f
or git
-
reset
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
P
earc
e
Added completion
su
p
port for git-
b
ra
n
ch
.
exe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree