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 von Zweigbergk
reset
.
c: re
m
ove u
n
nec
e
ssary variable
'
i'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von Z
w
eigbergk
reset
.
c: e
x
tract function f
o
r p
a
rs
i
ng argu
m
ents
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Mar
t
i
n
v
o
n
Zweigb
e
r
g
k
reset:
don't allow
"
git reset -- $pathspec" in bare
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von
Z
weigbergk
r
eset
.
c
:
p
ass path
s
pe
c
a
r
ound i
n
ste
a
d
of (prefix,
a
r
gv
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
artin von Zweigb
e
rgk
reset
$
p
a
thspec:
e
xit with code 0 if succes
s
ful
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
reset $p
a
th
s
pec: no need to discard in
d
e
x
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Martin von Zweigb
e
rgk
o
ne
w
ay_merge(): only lstat() when told to up
d
at
e
work
t
r
ee
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin v
o
n Zweig
b
ergk
re
b
ase usage: su
b
commands can not be combined w
i
th -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
a
rti
n
von Zweigbergk
che
r
ry-pick/r
e
vert: r
e
spect order of revision
s
t
o
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
a
rtin von Zw
e
igberg
k
de
m
ons
t
ra
t
e broken 'gi
t
ch
e
rry
-
pick three
o
ne two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Z
w
eigbergk
teach log -
-
no-walk=un
s
orte
d
, which avoids
s
orting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Marti
n
von Zweig
b
ergk
a
dd te
s
ts for 'git reb
a
se --kee
p
-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin
von
Z
we
i
gbergk
cherry: remove re
d
undant chec
k
f
o
r
merge commi
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Mar
t
in von
Zweigb
e
rgk
c
herry:
don't se
t
ignored
r
ev_info o
p
tio
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Zweigbergk
remove
u
nne
c
essary parameter from g
e
t
_
patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
M
artin von Zwe
i
gbe
r
gk
a
d
d
t
e
st cas
e
for rebase of
e
mpty commit
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zw
e
igbergk
a
m
:
d
on't call ma
i
lin
f
o
i
f $re
b
asing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin
vo
n
Zweigberg
k
a
m
-
-
r
e
basing: get patc
h
body fr
o
m commit, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
art
i
n von Zw
e
i
g
bergk
reb
a
se -
-
root: print usage on
t
oo
many args
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on Zweigbergk
r
ebase
:
don't
s
ource git
-
sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
M
a
rtin von Zweigbergk
t3401: use t
e
st_co
m
mit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zw
e
igbergk
t3401: modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Z
w
eigbergk
am
:
don't persist keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigb
e
rgk
remote: on
l
y update remote-tracking bra
n
ch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Marti
n
von Zweigberg
k
remote re
n
ame: warn when refspec wa
s
not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
artin von Zwei
g
bergk
r
emo
t
e: "ren
a
me o f
o
o" should not ren
a
me ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin vo
n
Z
w
eigbergk
remote: wri
t
e cor
r
ect fetch
s
pec when renaming remot
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rti
n
von Zwe
i
gbergk
gitk:
Show modified
f
iles with separ
a
te
w
ork tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigbergk
gitk: Si
m
plify ca
l
cu
l
ation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n
v
on
Z
weigberg
k
gitk: R
u
n 'git rev-parse --git-di
r
'
only
once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Put temporary directory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gi
t
k: Fix "External diff" with separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigbe
r
g
k
gitk: Fix "blame p
a
rent commit" with separate
work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on
Z
weigbergk
gi
t
k: Fix "show orig
i
n of t
h
is lin
e
" with sepa
r
a
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zwei
g
bergk
g
itk: Fix f
i
l
e high
l
i
g
ht when ru
n
in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Mar
t
in vo
n
Zweigbergk
rebas
e
: cla
r
i
f
y
"restore
th
e
original bra
n
c
h
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin v
o
n Z
w
eigb
e
rg
k
Docu
m
entation: use [verse] for SYNOPSI
S
sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
artin von
Z
weigbergk
d
i
ffco
r
e-rena
m
e: don't
consi
d
er u
n
merged pat
h
as
s
our
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
a
rtin von Zweigb
e
rgk
rebase
:
d
e
f
i
ne opt
i
ons in
OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
artin
v
on Zweigbergk
M
akefi
l
e: do not instal
l
sourced
r
ebase scri
p
ts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
von Zwei
g
bergk
mergetool: don't skip modify/rem
o
v
e conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
tin von Zwei
g
berg
k
r
erere "r
e
ma
i
n
ing"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase: use
@
{upstream
}
if no u
p
s
tream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von
Z
w
e
igbergk
r
e
b
ase -i: remove u
n
necessary state rebase-r
o
o
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zweig
b
ergk
r
e
base -i:
d
on't
re
a
d unused va
r
iable preserv
e
_
merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
vo
n
Zweigbergk
git-re
b
ase--am: r
e
move unnecessary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
we
i
gbergk
r
e
base -m: do
n
'
t prin
t
exit
code
2 whe
n
merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
e
rgk
rebase -m
:
remembe
r
a
l
low_
r
erere_autoupda
t
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweigbergk
reb
a
se: remember str
a
teg
y
a
nd strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
er
g
k
reba
s
e: remember v
e
rbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase:
extract co
d
e
for
w
r
i
ting
b
as
i
c
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zwei
g
bergk
rebase: factor out sub
c
ommand hand
l
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zwe
i
g
b
ergk
re
b
a
se:
m
ak
e
-v a
tiny b
i
t more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase -i: align
varia
b
le names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigb
e
r
gk
r
e
b
ase: show consistent co
n
flict
r
e
solution
h
i
nt
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
r
e
base:
e
xtract am co
d
e
t
o
new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase:
e
xtract
m
erge code to ne
w
sourc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zwe
i
gbergk
r
e
b
as
e
: remove $b
r
anc
h
as synonym for $orig
_
h
ead
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zweigbergk
rebase:
f
actor out r
e
ference p
a
rsi
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigb
e
rgk
reb
a
se -i: s
u
pport
-
-stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
w
eigber
g
k
rebase: reorder valid
a
tion steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigb
e
rgk
rebase:
factor out call
t
o
pre-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eig
b
ergk
rebase -
i
: r
e
move now unneces
s
ary dir
e
ctory
c
hecks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigberg
k
rebase:
factor out clean w
o
rk tree che
c
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigber
g
k
rebas
e
: factor out command line option proces
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
r
eba
s
e: align variable conten
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
e
rgk
rebase: align
vari
a
ble name
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von
Z
w
e
i
gbergk
rebase: stricter
c
h
e
ck
o
f standalone
s
u
b com
m
and
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbe
r
gk
r
ebas
e
: act on command line
o
utside pa
r
sing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in vo
n
Zwe
i
gb
e
rgk
reb
a
se: imp
r
ov
e
de
t
ection of reb
a
se in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
r
ebase: remove unused rebase state 'prev_h
e
ad'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
b
ase:
read st
a
te o
u
tside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Z
w
eigbergk
r
e
base: refactor reading o
f
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: clearer names
f
or directory
v
ariables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin
v
on Zweigbergk
completion: add missi
n
g configuration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin
von Zwei
g
bergk
Use reflog i
n
'pul
l
-
-
rebas
e
.
f
oo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin v
o
n Zweigbergk
rebase:
o
nly show s
t
at i
f
c
o
nfigured
t
o
tru
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbe
r
gk
rebase -
-
abort: do
n
o
t
upda
t
e
branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigbe
r
gk
rebase:
s
upport --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin v
o
n
Zweig
b
ergk
D
ocum
e
n
tation/git-pu
l
l
:
clarify con
f
i
g
uration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Marti
n
von Zwe
i
gbergk
re
b
ase -X: do not
c
l
o
bber
s
trategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree