repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Honor pull.{twohead,octopus} in git-merge.
2006-12-28
Shawn
O
.
Pearce
Honor pull
.
{twohead,octopus} in gi
t
-mer
g
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Sh
a
wn
O
.
Pearce
Ensure `g
i
t-
p
ull`
f
ails if `git-merge` fails
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
S
h
a
wn O
.
Pea
r
ce
Use
branc
h
names in '
g
it-rebase -m
'
conflict hun
k
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pear
c
e
Honor GIT_REFLOG_ACTION in git-
r
ebase
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Use GIT_REFLOG_ACTION
environment variable
i
nste
a
d
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pearce
Create
'gi
t
g
c
' to pe
r
fo
r
m comm
o
n maintenance
o
pera
t
ions
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearce
Sw
i
tch git_mmap to
u
s
e
pr
e
ad
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-24
Shaw
n
O
.
Pe
a
rc
e
Rename
g
itfa
k
e
mmap to git_mmap
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pea
r
ce
Display 'theirs' branch name
w
he
n
possible in merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pearce
Use ex
t
ended SHA1 syntax in merge-recurs
i
v
e
c
on
f
licts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Sha
w
n O
.
P
e
ar
c
e
D
o
n't crash during
r
epack of a re
f
l
og with prun
e
d commits
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearc
e
Introduce a
global lev
e
l warn() function
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn
O
.
Pea
r
ce
Renam
e
imap-send's internal info/warn fun
c
tions
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Suggest 'a
d
d'
i
n am
/
revert/ch
e
rry-
p
ick
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-17
Shawn O
.
Pearce
Defaul
t
GIT_
C
OMMI
T
TER_NAME to
l
ogin name in r
e
c
ieve
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
S
hawn O
.
Pearce
Align
s
e
ction headers
o
f '
g
it sta
t
us' to new '
g
it add'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
S
h
awn O
.
Pearc
e
Sug
g
est
use of
"git a
d
d file1 file
2
"
when
t
here
is
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Tea
c
h bash th
e
new fea
t
ures of '
g
it show'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pea
r
ce
Enabl
e
r
e
flogs by default in any rep
o
sito
r
y with a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearc
e
Pr
o
vide more meaning
f
ul output
f
rom 'git
init-db
'
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-16
Shawn O
.
Pearce
Avoid access
i
ng
a
s
l
ow working copy during dif
f
core
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-14
Shawn
O
.
Pearce
Bypa
s
s expensive
c
ontent co
m
p
a
rsion during
r
ename de
t
e
c
ti
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-12-11
S
haw
n
O
.
Pearce
Mak
e
sure the empty tree exists when needed in merge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Shawn
O
.
Pearce
F
i
x
broken bash comple
t
ion
of l
o
cal
r
efs
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-28
Sh
a
wn O
.
Pearce
Teac
h
bas
h
how to complete long optio
n
s
for g
i
t-commit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teac
h
bash about git-am/git-a
p
p
l
y
and thei
r
whitespace
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
ce
Cache the list of merge
s
trategies and ava
i
l
a
ble commands
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
a
rce
S
u
pport --strategy=x completion i
n
a
d
dition to --strategy x
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach
b
ash about git-
r
e
p
o-co
n
f
i
g
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Suppo
r
t
b
a
sh compl
e
t
i
on of refs/remote
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
P
e
arce
Teach bash about git
log/show/
w
hatcha
n
ge
d
options
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teac
h
bash how to complete git-reba
s
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pearce
Teach bash
how to co
m
plete git
-
ch
e
rry-pick
.
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
g
it-
f
ormat-patch
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Add cu
r
rent br
a
nch
in PS1 suppor
t
to
git-completion
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash how t
o
c
o
mplete o
p
tions for
g
it-name-rev
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
H
ide plumbi
n
g/transp
o
r
t
com
m
a
nds from bas
h
comp
l
eti
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
T
each g
i
t-co
m
pleti
o
n
.
bash how
t
o
complete git-merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sha
w
n
O
.
Pea
r
ce
R
emov
e
more se
d
invocati
o
n
s from wi
t
hin bash completio
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
P
ear
c
e
Support bash
c
omp
l
eti
o
n on symmetric di
f
feren
c
e oper
a
tor
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pe
a
rce
Ta
k
e -
-
git-dir into co
n
sid
e
ration during
bash completion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
S
hawn
O
.
P
earce
Ba
s
h complet
i
on support
for remotes
in
.
git/
c
o
nfig
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
P
e
arce
Only load
.
e
xe suff
i
x'd co
m
pletio
n
s on Cygwin
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
P
earce
Added mis
s
ing comp
l
e
tions
for show-branch and
merge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Sha
w
n O
.
P
e
arce
R
emove u
n
supported C
9
9 style struct initializers
i
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearc
e
Remove SIMPLE_PROGRAMS and m
a
k
e git-daemon a
n
orm
a
l
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Use ULONG_M
A
X ra
t
her
than implicit c
a
st
of -1
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn
O
.
Pea
r
ce
Added ba
s
h comple
t
ion supp
o
rt for gi
t
-
r
e
set
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Added completi
o
n
support for git-
b
r
a
nch
.
exe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree