repo.or.cz
/
stgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Only check for upstream merges if not fast-forwarding
2007-03-12
Cata
l
in Marinas
Only check for upstr
e
am
m
e
r
g
e
s if
n
o
t
f
ast-forwar
d
ing
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-03-06
Catalin
M
arinas
[
R
e
vert] Make '
p
us
h
--u
n
do' s
a
fer
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-03-06
Yann Dir
s
on
Fi
x
bash completion t
o
n
o
t ga
r
ble the scre
e
n
w
i
t
h an
.
.
.
commit
|
commitdiff
|
tree
2007-03-02
Ya
n
n Dirson
Add c
o
nt
r
ib/stg-s
i
nk:
s
i
nk a patch to gi
v
e
n
location
.
.
.
commit
|
commitdiff
|
tree
2007-03-02
Y
a
n
n
D
i
r
son
A
d
d
contrib/stg-mdiff: d
i
splay
diffs of
d
iffs
.
commit
|
commitdiff
|
tree
2007-03-02
Yann
Dirson
Add contrib/s
t
g-git
k
: helper sc
r
ipt to run gitk
commit
|
commitdiff
|
tree
2007-03-02
Yann
D
irson
A
d
d contrib/stg-cvs: helper scri
p
t to manage a mix
e
d
.
.
.
commit
|
commitdiff
|
tree
2007-03-02
Yann Dirson
Add contrib/st
g
-swallow: com
p
letely mer
g
e an unapplied
.
.
.
commit
|
commitdiff
|
tree
2007-03-02
Yann
D
i
r
s
o
n
Add c
o
ntrib/stg-f
o
ld-fi
l
es-fr
o
m: pick
s
electe
d
c
ha
n
ges
.
.
.
commit
|
commitdiff
|
tree
2007-03-02
Yann Dirson
A
d
d contr
i
b/
s
t
g-s
h
o
w
-old: show old v
e
rsio
n
o
f
a pat
c
h
.
commit
|
commitdiff
|
tree
2007-03-02
Y
a
n
n Dirson
A
dd
c
o
n
tri
b
/stg-whatch
a
nged
:
l
o
ok at
w
h
at w
o
uld be
.
.
.
commit
|
commitdiff
|
tree
2007-02-28
Catalin
M
a
r
i
n
as
Use and
.
.
or a
s
a
t
e
rnary op
e
rator rather than a
d
i
c
tionary
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-28
Catalin M
a
rinas
Add
Editor
E
xception t
o
st
g
i
t
/utils
.
py
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-28
Cata
l
in
M
a
rinas
Add an i
n
terrac
t
ive 2-way merge option
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-28
Yann Dirson
Ad
d
missing f
i
les to stgit manifest
.
commit
|
commitdiff
|
tree
2007-02-28
Yann Dirso
n
Merge doc/ and Documentation/ direc
t
ories
.
commit
|
commitdiff
|
tree
2007-02-28
Ya
n
n Dirson
Add a Documentation d
i
rec
t
ory insp
i
red
by the git o
n
e
.
commit
|
commitdiff
|
tree
2007-02-28
Yann D
i
rson
Factorize editor handlin
g
.
commit
|
commitdiff
|
tree
2007-02-28
Ya
n
n Dirson
Ad
d
a
testcase f
o
r the
safety of pull-policy='p
u
ll'
.
commit
|
commitdiff
|
tree
2007-02-27
Yann D
i
r
son
Correctl
y
raise
e
x
c
e
p
tion on u
n
known
pull-policy
.
commit
|
commitdiff
|
tree
2007-02-23
C
a
t
a
lin M
a
ri
n
as
Add --br
a
n
ch option
t
o
'
patches'
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-23
Sam
Vilain
Some min
o
r debian packa
g
i
ng f
i
xes
commit
|
commitdiff
|
tree
2007-02-21
Yann Di
r
son
Rewor
k
of the 'stg pull' policy
.
commit
|
commitdiff
|
tree
2007-02-21
Yann
Dirson
Refuse
t
o
pull/rebase
w
hen ren
d
ered unsafe by (un)
c
ommits
.
commit
|
commitdiff
|
tree
2007-02-21
Y
a
nn Dirs
o
n
K
eep track of safe base
changes
.
commit
|
commitdiff
|
tree
2007-02-21
Yann
Dirso
n
Va
r
ious cleanups
f
o
r
clarity
.
commit
|
commitdiff
|
tree
2007-02-21
Yann Dirson
M
o
ve sta
c
k-base quer
y
i
n
g
into Ser
i
es
c
l
ass
.
commit
|
commitdiff
|
tree
2007-02-21
Yann Dirson
Factorize r
e
basing
behaviour
.
commit
|
commitdiff
|
tree
2007-02-21
Yann Dirson
Support for
p
re-1
.
5 git in stgit
tests
.
commit
|
commitdiff
|
tree
2007-02-21
Catalin
Mari
n
a
s
Fix the mai
l
command to p
a
rse
l
onger
address he
a
ders
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-21
C
a
ta
l
in Marina
s
Fix the
a
lias che
c
k
i
n the
mail --bcc
co
m
mand
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-21
C
a
talin
Marinas
Display
w
hether the patch is empty
after refresh
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-17
Catalin
M
a
r
ina
s
Fix import
t
o
a
l
low
-
-
name and -
-
strip
for mos
t
import
.
.
.
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-17
Clark
W
ill
i
ams
URL import for stgit
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-16
Catali
n
Ma
r
inas
Add --auth
o
r
o
ption t
o
series
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-16
Ca
t
alin Marinas
Al
l
o
w
importing mbox files fr
o
m
s
t
din
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-13
Catalin Ma
r
i
n
as
Fix the beh
a
v
iour when there is
no user informati
o
n
.
.
.
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-13
Catalin M
a
rinas
Make S
t
G
IT aw
a
r
e of
t
he
S
T
GI
T
_D
E
BUG_
L
E
VEL
e
nviro
n
men
t
.
.
.
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-13
Yann Dirson
Use
canoni
c
a
l
co
m
mand name in hel
p
message
.
commit
|
commitdiff
|
tree
2007-02-13
Yann Dirson
Add
-
-merged o
p
tion t
o
r
e
base
.
commit
|
commitdiff
|
tree
2007-02-06
C
atalin
Marinas
R
elease 0
.
12
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-06
Catalin
M
arinas
Ad
d
extra fil
e
s to MANIFEST
.
in
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-06
C
a
t
a
lin M
a
rinas
Es
c
ape
t
he quotes in example/gi
t
config
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-05
Catalin Marinas
Stop the
e
-mail sending if editor fails
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-05
Yann Dirson
Use branch
.
*
.
stgit
.
p
arentbran
c
h for
a
uthoritative
p
arent
.
.
.
commit
|
commitdiff
|
tree
2007-02-05
Pavel Rosk
i
n
Add missing sp
a
ces in warn
i
ngs abou
t
d
efa
u
lt remot
e
commit
|
commitdiff
|
tree
2007-02-04
P
avel Roski
n
Assorted typos
commit
|
commitdiff
|
tree
2007-02-04
P
avel Roskin
Don't print "rebasing" if the head
doesn'
t
change
commit
|
commitdiff
|
tree
2007-02-04
Pavel Roskin
C
opy remote and me
r
ge s
e
ttings when cl
o
ning a br
a
n
c
h
commit
|
commitdiff
|
tree
2007-02-04
P
a
v
e
l Roskin
Rename branch section in con
f
i
g
wh
e
n t
h
e b
r
anch is
.
.
.
commit
|
commitdiff
|
tree
2007-02-03
Yan
n
D
i
rson
Use FE
T
C
H_HEAD to kno
w
where to rebase t
o
after pull
.
commit
|
commitdiff
|
tree
2007-02-03
Yann Dirson
Warn
the user when there is no pare
n
t informati
o
n in
.
.
.
commit
|
commitdiff
|
tree
2007-02-03
Yann Dir
s
on
Corr
e
ctly c
h
eck the pull-does
-
rebase parameter in
.
.
.
commit
|
commitdiff
|
tree
2007-02-02
Pav
e
l
R
os
k
in
Allow
.
git/branches and
.
g
it/remotes to be m
i
ssing
commit
|
commitdiff
|
tree
2007-02-02
Yann Di
r
son
D
o
n
o
t return
'origin'
a
s parent
remote when the
r
e
.
.
.
commit
|
commitdiff
|
tree
2007-02-02
Y
a
nn Dirson
Reb
a
se to parent b
r
an
c
h
a
fter git-fetch
i
n "
s
tg pull"
.
commit
|
commitdiff
|
tree
2007-02-02
Yann D
i
rson
The user
d
oes not want to
m
e
s
s
w
ith t
h
e refspecs
.
commit
|
commitdiff
|
tree
2007-02-02
Catalin M
a
rinas
Check fo
r
invalid patch
n
ames b
e
fore acting
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-01
Catalin M
a
rinas
set() is not a
b
uiltin
functi
o
n in Python 2
.
3
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-02-01
Yann Dirson
F
i
xes to doc strings
.
commit
|
commitdiff
|
tree
2007-01-31
Yann Dir
s
on
Make 'stg pull' us
e
g
it-fetch and not git-pu
l
l
.
commit
|
commitdiff
|
tree
2007-01-31
Y
ann Dirson
Have 'stg branch --create
'
r
ec
o
r
d
parent informa
t
ion
.
commit
|
commitdiff
|
tree
2007-01-31
Yann
D
irson
Basic s
u
ppor
t
f
o
r kee
p
in
g
a
r
e
f to
the paren
t
br
a
nch
.
commit
|
commitdiff
|
tree
2007-01-31
Yann Dirson
Allow
s
extract
i
on of info
r
matio
n
abo
u
t remotes
.
commit
|
commitdiff
|
tree
2007-01-31
Yan
n
Dirson
Move id
e
nt
i
ficati
o
n of parent b
r
anch
'
s remote def up
.
.
.
commit
|
commitdiff
|
tree
2007-01-31
Y
a
nn D
i
r
son
Add caching to th
e
new config class
.
commit
|
commitdiff
|
tree
2007-01-31
Yann
D
i
rson
Ma
k
e stgit
.
c
onfig u
s
e git-repo-confi
g
.
commit
|
commitdiff
|
tree
2007-01-26
Catal
i
n Marinas
Make the 's
e
ries --
s
hort' length configurable
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-26
Cat
a
lin Marinas
Add
s
upport to hi
d
e and un
h
ide patches
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-25
C
a
tal
i
n Marinas
'--showbranch' and '--nopr
e
fix'
optio
n
s for 'series'
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-25
Catalin Mari
n
as
Allow
a
patc
h
range to b
e
specifi
e
d for 'series'
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-25
Catali
n
Marinas
H
ide t
h
e
test_crea
t
e_repo output
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-25
Ca
t
ali
n
Marinas
Synchronise the current patch if none
spe
c
i
fied for
.
.
.
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-21
Catalin Marinas
Fi
x
th
e
displaying of unknown
f
iles for
'
stg
s
tatus'
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-21
Yann Di
r
son
A
d
d new 'rebase'
command
.
commit
|
commitdiff
|
tree
2007-01-12
Ca
t
alin Mari
n
as
Tr
a
ck the
f
il
e
s
c
onfli
c
t history
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-10
Catalin M
a
r
i
nas
Add option
t
o automa
t
ically invoke
t
he
i
nt
e
ract
i
ve
.
.
.
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-10
C
at
a
lin Marinas
A
l
low
e
-mail alia
s
es fo
r
the "ma
i
l" comm
a
nd
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-10
Catalin Marinas
Indent the
ex
a
mple git
c
onf
i
g
file
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-10
P
avel
R
oskin
Check git pull remote before defaulting
t
o
'o
r
igin'
commit
|
commitdiff
|
tree
2007-01-10
Cata
l
in Marinas
Pipe the 'patches -
-
diff' output through th
e
pager
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-04
Cat
a
lin Marinas
F
ix the
br
a
nch renam
i
ng to
a
lso rename t
h
e r
e
flogs
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2007-01-04
Catal
i
n Marinas
Add '-
-
missing' o
p
tion
to 'se
r
ies'
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-13
Catalin Marinas
Fix the ba
s
h
completi
o
n whe
n
the
r
e is no patc
h
a
pplied
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-12
C
a
talin
M
arinas
Allow the mai
l
c
ommand t
o
send
unapplie
d
pa
t
c
hes a
s
.
.
.
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-12
Catalin Marinas
A
d
d the --una
p
plied optio
n
to pick
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-11
Pavel Ros
k
in
T
h
e autho
r
's add
r
ess i
s
i
ncorrect in setyp
.
p
y
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-11
Catalin Ma
r
inas
Allow the ab
b
rev
i
ation of
StG
I
T commands
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-08
C
a
t
a
li
n
Marinas
Don't a
l
ways use git-me
r
ge-rec
u
rsive because of speed
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-07
Catalin Marinas
Ad
d
the 'sync'
c
om
m
and
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-07
Ca
t
alin Marinas
Mak
e
'push --undo' safer
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-07
Catali
n
Marinas
Fix
a
m
erge case with fi
l
e
s a
d
d
e
d in both h
e
ads but
.
.
.
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-07
C
a
t
a
lin Marinas
Pri
n
t 'refresh done' before pu
s
hing other patches
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-06
Catalin Marinas
Pipe
t
he
'
stg help <command>' output t
h
rough
the pager
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-06
Catalin Marinas
Allow patch ranges for the
'
pop' c
o
m
mand
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-06
Catalin Marinas
Allow ranges for th
e
'
export' command
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-06
C
a
talin
M
arinas
Fi
x
the 'clean' command not to
pop
a
ll the
p
atches
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-05
Catalin
Mari
n
a
s
Flush the st
d
out
i
n the
commit command
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-05
Catalin
Marinas
Fix "s
e
ries -d" when th
e
pat
c
h description is empty
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
2006-12-05
Catalin Marinas
Allow the c
l
on
i
ng of
b
ranches not
under StGIT
con
t
rol
Signed-off-by: Catalin Marinas <
catalin.marinas@gmail.com
>
commit
|
commitdiff
|
tree
next