repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/format-patch-reroll'
2012-12-23
M
ar
t
in
v
on Zwe
i
gbergk
le
a
rn
t
o
pick/revert into unborn branch
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-23
Ma
r
tin von Zwe
i
gbergk
test
s
: mov
e
test_cmp_r
e
v to test-lib-functions
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Marti
n
von Zwei
g
b
e
r
gk
o
neway_merge(): only l
s
t
a
t(
)
w
h
en t
o
ld t
o
update worktree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin von Z
w
eigbergk
r
e
b
ase usage: subcommands can no
t
be combi
n
ed
w
ith
-i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zw
e
igbergk
cher
r
y-pick
/
revert: respe
c
t order of revisions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Marti
n
v
on Zweigbergk
d
e
monst
r
at
e
br
o
ken 'git
c
her
r
y-pick three on
e
t
w
o'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zwe
i
gbergk
t
e
ach log
-
-
no
-
walk=unsorted, which
a
voids sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von
Z
weigberg
k
add
test
s
for
'git rebase
-
-
k
eep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigbergk
che
r
ry: remove
redundant check
for merge
commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigb
e
rgk
cherry
:
don
'
t set ignored rev_inf
o
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Mart
i
n von
Zweigberg
k
remove
unnecessary
p
aramet
e
r from
g
et_pa
t
ch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
M
a
rtin von Z
w
eigberg
k
add test
c
ase for r
e
bas
e
of empty
c
ommit
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigb
e
rgk
am: don't call ma
i
linf
o
if
$rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigberg
k
am --rebasing: get
p
atch body from commit,
n
ot from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
artin v
o
n Zweigbergk
rebase
-
-root: print
u
s
age on too ma
n
y
a
rgs
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
o
n Zw
e
igbe
r
gk
reb
a
se: don't
s
ource git-sh-set
u
p twice
commit
|
commitdiff
|
tree
2011-12-12
Mart
i
n von Zweigbergk
t3401: use
te
s
t_commit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Mar
t
i
n
von Zweigbergk
t3401: mod
e
rnize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
M
artin
vo
n
Zweig
b
e
r
gk
am: don't pers
i
s
t
keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
i
n
v
o
n Zwe
i
g
b
ergk
remo
t
e: only updat
e
re
m
ote-trac
k
ing branch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweig
b
ergk
remote
rename: warn when re
f
spec was not upda
t
ed
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von Zweigbergk
remote: "rena
m
e
o fo
o
" sho
u
ld not rename ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin von Zweigbergk
remote: write corr
e
c
t fetch s
p
ec when renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin v
o
n
Zwei
g
be
r
gk
gitk:
Show mod
i
fied files w
i
t
h
separat
e
wo
r
k
t
ree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbe
r
g
k
gitk
:
Simplify
c
alculat
i
on of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zwe
i
gbergk
gitk: R
u
n 'git rev
-
parse
--git-dir' only o
n
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zweigbergk
gitk
:
Pu
t
temp
o
r
a
ry director
y
inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zwe
i
gberg
k
gitk: Fix
"Externa
l
diff" with
s
ep
a
ra
t
e work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigbergk
gitk: Fix
"blame pare
n
t commit" wi
t
h sepa
r
ate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von
Z
w
e
ig
b
ergk
gitk: F
i
x "show
o
r
igin of t
h
is li
n
e" wit
h
separa
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigber
g
k
gitk: Fix f
i
le highl
i
ght when run in subdirect
o
r
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von
Zweigbergk
rebase: cl
a
rify "restore the or
i
ginal b
r
anch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin
v
o
n Zweigbe
r
gk
Document
a
t
ion: use [verse] f
o
r SYNOPSIS s
e
ctions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin
von Z
w
eigb
e
rgk
diffcor
e
-rename
:
don't c
o
nsi
d
er unmerged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zweigberg
k
rebase: d
e
f
ine options in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin v
o
n Zweigbergk
Make
f
i
l
e:
d
o not install sourced rebase scr
i
pts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
v
on Zw
e
igbergk
m
e
rgetool: don
'
t
skip modif
y
/remove conflict
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Marti
n
von Z
w
e
i
gb
e
rgk
rerere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zweigbergk
re
b
ase: use @{up
s
tream} if no
upstream sp
e
cified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase
-i: remove unne
c
essary st
a
te reb
a
se-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
rebase -i
:
don't read unused variable pr
e
s
erve_
m
erges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
g
i
t-rebase--am:
r
e
mo
v
e unnecessary -
-
3
w
ay
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweig
b
ergk
re
b
ase -m: don't
p
rint exit code
2
when merge fai
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigbergk
rebase -m: remem
b
er allow_
r
erer
e
_au
t
oupda
t
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n
v
o
n Zw
e
ig
b
ergk
reb
a
s
e: rem
e
mber strategy
a
nd stra
t
egy o
p
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zwei
g
bergk
rebase: remember verb
o
se option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwei
g
bergk
rebase: extract code for writing basic
s
ta
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweig
b
e
r
g
k
rebase
:
fact
o
r out sub command h
a
n
dling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
er
g
k
re
b
ase: make -v a ti
n
y
b
it more
v
erbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
r
ebase
-i: ali
g
n variable n
a
m
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweigbergk
rebase: sho
w
c
onsistent conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
rebase: extract
a
m
code to n
e
w
source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
ti
n
von Zweigbe
r
g
k
rebase: ex
t
ract merge c
o
d
e
to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbe
r
gk
rebase
:
remove $bra
n
ch as synon
y
m for $orig_
h
ead
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
weigbergk
r
e
base: fa
c
tor out referenc
e
pars
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
i
gbergk
reb
a
s
e
-i: s
u
p
p
ort --st
a
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweig
b
e
r
g
k
re
b
ase: reorder
val
i
datio
n
s
t
eps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: factor o
u
t call
t
o pre-rebas
e
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Z
w
eig
b
ergk
r
ebase -i: remove n
o
w unnece
s
sary d
i
rec
t
ory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
r
ebase: factor out cle
a
n work tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Zwe
i
gbergk
reba
s
e: facto
r
o
u
t command line o
p
tion processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igbergk
r
e
base: ali
g
n variable co
n
t
e
nt
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n
Z
w
ei
g
bergk
rebase: align v
a
riable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
reba
s
e
: stricter chec
k
of
standalo
n
e sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigbergk
r
ebase
:
ac
t
on command line outside par
s
ing lo
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwe
i
gbergk
r
e
base
:
improve detection of rebas
e
in
p
r
ogress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in
v
on
Zweigbergk
re
b
as
e
: remove unused rebase state
'
prev_h
e
a
d
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase: read state outside
l
oop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von
Z
w
eigbergk
r
e
b
ase: refactor readin
g
of s
t
ate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zw
e
igbergk
rebas
e
: clea
r
er
n
am
e
s for di
r
ectory
vari
a
bles
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Ma
r
ti
n
von Zwe
i
gbergk
comp
l
etion:
a
d
d
missing configurati
o
n variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin vo
n
Z
w
e
i
g
bergk
U
s
e reflog in
'pull --rebas
e
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
ti
n
von Zweigbergk
rebase: onl
y
show stat
if
configur
e
d to t
r
ue
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
arti
n
v
o
n
Zweigbergk
reba
s
e --abort: do
n
o
t upd
a
t
e b
r
anch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Mar
t
in von Z
w
eigb
e
rgk
r
ebase: support --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Marti
n
von
Zweigbergk
Documentation/git-pul
l
: clarify con
f
ig
u
ration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Marti
n
von Z
w
eigbergk
r
e
b
ase -X:
d
o
not cl
o
bber
s
tr
a
tegy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree