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
reset.c: remove unnecessary variable 'i'
2013-01-15
Martin
v
on Zweig
b
ergk
reset
.
c
:
remove unnecessary v
a
r
i
able 'i'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Z
w
eigber
g
k
r
eset
.
c
: e
x
tract
f
unction for parsing
a
rguments
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbe
r
gk
reset: don't a
l
low "g
i
t reset --
$
pathspec" i
n
bar
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin v
o
n Z
w
e
i
gbergk
reset
.
c: pass pathspec
a
round instead of
(
prefix
,
argv
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
rese
t
$pat
h
spec: exit
with code 0 if successful
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
ti
n
von Zweigber
g
k
reset $pathspec: n
o
need to
d
i
s
card index
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Martin von Zweigbergk
oneway_merge
(
):
o
nly lstat() when told to up
d
a
te wo
r
ktree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
M
a
rtin von Zwe
i
g
bergk
rebase u
s
age
:
subcommands
c
an not be com
b
i
n
ed
with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigberg
k
c
h
erry-pi
c
k/revert: re
s
pe
c
t
o
rder
of revisions
t
o
p
ick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
demonstrate
b
roken
'git cherry-pi
c
k
th
r
ee
o
ne
two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
tin von Zweig
b
ergk
teach l
o
g --no-wal
k
=unsort
e
d, which avo
i
ds sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Mart
i
n von Zwei
g
bergk
ad
d
t
e
st
s
for
'
git rebase --
k
eep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
a
r
t
in
v
on Zweigbergk
cherry: rem
o
v
e redundant check for
m
erge commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin
von Zweigbergk
cherry: don't set ig
n
o
red rev_info op
t
ions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Zweigberg
k
rem
o
ve
unnece
s
s
a
ry parameter from
g
e
t_patc
h
_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Z
w
eigbergk
add test cas
e
fo
r
rebase
of e
m
pty commit
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n
v
o
n Zweigbergk
a
m
: don't call mailinfo if $re
b
asin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am --reb
a
s
in
g
: g
e
t
p
atch
body from commit, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
o
n Zweigber
g
k
rebase
-
-
root: print usage
on too many args
commit
|
commitdiff
|
tree
2012-06-26
M
arti
n
von
Z
weigbe
r
gk
reb
a
se: don'
t
s
ource git-sh-setup twi
c
e
commit
|
commitdiff
|
tree
2011-12-12
Martin von
Zweigbergk
t
3
401
:
use t
e
st_commit
i
n setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
M
artin von Z
w
eigbergk
t3401: moderni
z
e
style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin
von Zwe
i
gb
e
rgk
a
m
:
d
on'
t
pe
r
sis
t
keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
re
m
ote
:
only upd
a
te
remote-
t
racking branch if upd
a
ting
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von
Z
w
eigbergk
remote re
n
ame: warn wh
e
n
refspec was
not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von Zweigbergk
r
e
mote
:
"re
n
ame o foo
"
should not r
e
name r
e
f "or
i
gin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in von Zwei
g
bergk
remot
e
: write correct fetch spec
when renami
n
g remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwei
g
bergk
git
k
: Show modified fi
l
e
s with
separa
t
e work tre
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin
von Zweigbergk
gitk: Sim
p
lif
y
c
a
lculati
o
n of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
v
o
n
Zweigbergk
gitk: Run
'
git rev-parse --git-dir
'
o
n
ly
once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Z
w
eigbe
r
g
k
gitk: Put temp
o
r
ary dire
c
t
o
ry inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zwe
i
gbergk
g
itk:
Fix "Externa
l
di
f
f" w
i
t
h separate w
o
rk tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zw
e
igbergk
gitk: Fix "b
l
ame paren
t
c
o
mmit" with s
e
p
a
rate wo
r
k
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
v
on
Z
weig
b
er
g
k
gitk:
Fix "
s
how origin of this line
"
w
i
th separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
r
t
in
von Z
w
eigbergk
gitk: Fi
x
file hi
g
hlight when run in subdirec
t
ory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweig
b
e
r
gk
r
e
base
:
clarify "re
s
tore
the original b
r
anch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Mart
i
n von Zweigbergk
Doc
u
mentation
:
use [
v
erse] fo
r
SYNOP
S
I
S
s
e
ctions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Z
w
eigbergk
diffco
r
e-ren
a
me: don'
t
con
s
ider unmer
g
ed pa
t
h as s
o
urce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin
v
on Zwe
i
gbergk
rebase: define opt
i
ons in OPTION
S
_
SPE
C
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Marti
n
von
Zweigbergk
Makefile: do not install
sourced rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mar
t
in
v
on Zweigbergk
mergetool:
d
on't skip modif
y
/
r
emove conf
l
icts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mar
t
i
n von Zweigberg
k
rer
e
r
e
"remai
n
ing"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweig
b
e
r
gk
re
b
a
s
e: use
@{u
p
stream} if n
o
upstr
e
am
s
pecifi
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n
Zwei
g
bergk
rebase -i: rem
o
ve unnecessary state
rebase-roo
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n
Zweigbe
r
gk
rebase -
i
:
do
n
't read unused vari
a
ble
p
reserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git-reb
a
s
e--a
m
:
remove unnec
e
s
s
ary --3way optio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -m: do
n
't print exit c
o
de 2 when
m
erge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
von
Z
wei
g
bergk
rebase -m: remember all
o
w_rerere_autoupd
a
te option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
ergk
rebase: remember strategy an
d
strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
r
e
base:
r
e
m
ember verbo
s
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweigbergk
rebase: ex
t
ract co
d
e for writing basi
c
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
ergk
r
e
base
:
factor out
sub command hand
l
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbe
r
g
k
reb
a
se: make -v a t
i
ny bit
more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Zw
e
igbergk
rebase
-
i: alig
n
variab
l
e
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: show co
n
sistent conflic
t
reso
l
ution h
i
nt
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
erg
k
reba
s
e: extract
am code to
n
ew source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
r
ebase:
ext
r
act merge code to ne
w
s
o
urce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: re
m
ov
e
$br
a
n
c
h
as sy
n
o
nym for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
v
on Zwei
g
b
e
r
gk
rebase: facto
r
out
r
eferen
c
e parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebas
e
-i:
suppo
r
t --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwe
i
gbergk
rebase: r
e
order validat
i
on steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
w
eigbergk
rebase
:
f
a
ctor out call to pre-re
b
ase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigbe
r
gk
re
b
as
e
-i:
r
e
move now unne
c
essary
dire
c
t
o
ry checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
reba
s
e: factor out clean work tree
c
heck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
r
eba
s
e: f
a
ct
o
r out command line
o
ption processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: ali
g
n variable conten
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: al
i
g
n
va
r
iable
n
ame
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigbergk
rebase: stricter check of
standalone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
on Z
w
eig
b
erg
k
rebase: act on
command line outside parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: impro
v
e detection of rebase in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n
Z
weigb
e
r
g
k
rebase: remove unuse
d
r
ebase state 'prev_
h
ea
d
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: read
s
tate
o
u
t
s
ide loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
r
ebase: refactor reading
o
f
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: clear
e
r
n
ames for directory variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Mart
i
n von Zwe
i
g
bergk
complet
i
on: add missing
c
onfigura
t
ion
vari
a
ble
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin v
o
n Zweigberg
k
Us
e
re
f
log in 'pull --rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von
Zweigbe
r
gk
rebase
:
only show stat if configured to
true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
artin von Zw
e
igbergk
rebas
e
--
a
bort: do
n
ot
update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigbergk
re
b
ase
:
support --ver
i
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Z
w
e
i
gbergk
D
ocum
e
ntation/
g
it-pull: clarif
y
co
n
figura
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
artin vo
n
Zwe
i
gbergk
rebase -X: do
not
c
lobber s
t
rategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree