repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase: define options in OPTIONS_SPEC
2011-03-05
M
artin von Zweigbergk
reba
s
e: define opt
i
ons in OPTI
O
NS_SPEC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-25
Martin
von Zweigbergk
M
akefile: do not install sourced rebase scri
p
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Z
weigbergk
r
e
b
ase:
use @{upstrea
m
} if no upstr
e
am specif
i
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Z
weigbergk
rebase -i
:
re
m
o
v
e unnecess
a
ry sta
t
e
rebase-roo
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zweigbergk
rebase -i: don't rea
d
unused variable
p
reserve_mer
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igber
g
k
g
i
t
-rebase--
a
m: remove un
n
ec
e
s
s
ary --3way
opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zweigb
e
r
g
k
r
e
b
a
se -m:
d
o
n
't
print ex
i
t code 2
when merge fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase
-
m:
re
m
e
m
ber allow_rerere_
a
u
t
o
u
pdate optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigb
e
rgk
rebase: remem
b
er strategy and st
r
ategy options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase:
remember verbose option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
w
eig
b
er
g
k
rebas
e
:
e
xt
r
ac
t
code
for writin
g
basic state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Zweigb
e
rgk
r
ebas
e
: factor out su
b
command ha
n
d
ling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigber
g
k
rebase: make -v a tiny b
i
t
more v
e
r
b
ose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
re
b
ase -i:
a
lign var
i
able
n
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: show consistent conf
l
ict reso
l
u
ti
o
n hint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigbergk
rebase
:
ex
t
ra
c
t am code to new
sourc
e
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
on
Z
weigbergk
re
b
ase: extract me
r
ge code to new source f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von
Zweigbergk
re
b
ase: remo
v
e $branch as synonym
fo
r
$orig_head
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i:
s
upport --stat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Z
w
ei
g
bergk
rebase
:
fac
t
or out call
t
o pre-re
b
ase
hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out c
l
ean work tree chec
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
v
on Z
w
eigbergk
r
e
b
ase: factor out reference
parsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
wei
g
berg
k
rebase: reorder valid
a
tion
steps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
reba
s
e -i
:
r
emove now
u
n
n
ecessary d
i
rectory checks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase: fac
t
or out
c
ommand line optio
n
p
r
ocessing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase:
a
lign variable cont
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebas
e
:
a
lign variable names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
:
stricter chec
k
of standalone sub command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
r
e
base: act on
c
ommand line
outside parsing loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Z
w
eig
b
ergk
rebase: improve
d
e
tection of reb
a
se i
n
progress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase: r
e
move unused
reba
s
e
sta
t
e
'prev
_
head'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
rebase: read state outside lo
o
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase:
r
ef
a
ctor reading of s
t
at
e
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: cl
e
a
rer names
for
d
irectory variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ham
a
no
Merge branch 'tr/merge-unborn-clob
b
er'
commit
|
commitdiff
|
tree
2011-02-10
Junio C
Hamano
Merge branch 'jc/unpack-tree
s
'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'jc/f
s
ck-fix
e
s'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C H
a
man
o
Merge branch 'tr/d
i
ff-words-test'
commit
|
commitdiff
|
tree
2011-02-10
J
unio C
Haman
o
Merge branch 'rr/f
i
-impo
r
t-m
a
rks-if-exists'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
Merge branch 'jn/u
n
pack-lsta
t
-failur
e
-repor
t
'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
i
o
C Ha
m
ano
Merge branch '
e
f/alias-via
-
ru
n
-
command'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hamano
Merge
b
ranc
h
'cb/setup'
commit
|
commitdiff
|
tree
2011-02-10
Junio C
Hamano
Merge branch 'ae/be
t
t
er-templ
a
te-f
a
ilur
e
-rep
o
rt'
commit
|
commitdiff
|
tree
2011-02-10
Junio C H
a
mano
Merg
e
b
r
anch 'jn/cherry
-
p
ick-strategy-option'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Haman
o
Merge branch 'maint-1
.
7
.
0' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nieder
fa
s
t-i
m
port: i
n
troduc
e
"feature
n
otes" command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
J
o
nathan Nieder
fa
s
t-import: clarify
docume
n
t
ation of "feat
u
re
"
command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-09
Uwe Kleine-König
Do
c
umentation/me
r
ge s
u
btree H
o
w-To: fix typ
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jens
Le
h
mann
pull:
D
ocument the "--[no-]recu
r
se-subm
o
dules
"
o
p
ti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
J
o
nathan Nieder
quote
.
h: simplify the inclu
s
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái N
g
ọc
Duy
s
ha1_object_info: exa
m
ine cached_ob
j
e
c
t
s
tore too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn
T
h
á
i Ngọc Duy
s
ha1_f
i
le
.
c: mo
v
e
fin
d
_c
a
c
hed_object up so sh
a
1_object_info
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
N
g
uyễn Thái N
g
ọc Duy
Add cons
t
t
o
pars
e
_
{commit,tag}_
b
uffer
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
N
g
uyễn Thái
N
g
ọ
c Duy
diff: support --cached on
unborn
b
r
a
n
c
hes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Ja
k
ub Narebski
gi
t
web
:
Mentio
n
opt
i
on
a
l Perl mo
d
u
l
es in IN
S
TALL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Sitara
m
Cham
a
rty
post-receive-email
:
suppress
e
rror if description file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat
Thoyts
t7407:
fix
l
ine endings for mingw build
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Sixt
t
4120-apply-popt: hel
p
s
y
s
te
m
s with core
.
filemode=false
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t
3509:
u
se unconst
r
aine
d
initial test to setu
p
re
p
ositor
y
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jo
h
a
nnes
Sixt
s
t
art_c
o
mmand: flush buffers i
n
t
h
e WIN32 code path
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Shaw
n
O
.
P
e
a
r
ce
bundle
:
U
s
e OFS
_
DE
L
TA in bun
d
le files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
Jun
i
o C Hamano
Me
r
g
e br
a
nch 'jl/f
e
tch-su
b
m
o
dule-re
c
ursive' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-01-31
Jens Lehmann
t5526: Fix wrong
a
r
gument order in "git con
f
ig"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Hamano
Git 1
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
J
u
nio
C
Hamano
fsck: do not give up
t
o
o early in fsck_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
J
u
nio
C Hamano
fsck:
d
rop unus
e
d p
a
r
a
meter f
r
om trav
e
rs
e
_one_obje
c
t()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Adam T
k
a
c
Don't pa
s
s "--x
h
tml" to hightl
i
ght
in gitweb
.
perl
s
cript
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio
C
Hamano
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Ni
e
d
er
rebase -
i
:
c
l
arify i
n
-edito
r
docume
n
tation of "exec"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
t
e
sts: sanitize more git en
v
i
ronme
n
t variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio
C
Hamano
Me
r
ge branch
'jn/fast-import-empty-tree-remo
v
al'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Ni
e
d
e
r
fast-impor
t
:
t
reat filem
o
dify with empty
t
ree
a
s delete
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: giv
e
a better error me
s
sage
f
or
b
o
gus branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
r
e
base: use explic
i
t "--
"
with che
c
kout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
J
u
nio
C
Hamano
Git 1
.
7
.
4-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Ha
m
an
o
M
erge bran
c
h 'as/user
d
iff
-
p
ascal'
commit
|
commitdiff
|
tree
2011-01-24
Ju
n
io
C
Hamano
M
erge bra
n
c
h 'jn/setup-
f
ixes'
commit
|
commitdiff
|
tree
2011-01-24
Jo
n
athan Nieder
t
1510:
fix typ
o
in t
h
e comm
e
nt of a test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Document
a
tion upda
t
es
f
o
r 'GIT_WORK_TREE w
i
thout
G
IT_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jon
a
than Nieder
S
ubject: s
e
tup: off
i
cially su
p
port -
-
work-tree without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jona
t
han N
i
e
d
er
Docum
e
n
t
a
t
ion: do n
o
t treat reset --
k
eep
a
s a spe
c
i
al
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-20
Bj
ö
rn
S
t
e
inbri
n
k
Correctly report corrupted object
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jona
t
han Nieder
tests: compress the
set
u
p tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
J
onathan
N
ied
e
r
te
s
t
s
: c
o
s
m
etic improvements to the
r
epo-s
e
tup tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge
branch '
m
aint'
commit
|
commitdiff
|
tree
2011-01-19
Erik Faye-L
u
nd
exec_c
m
d: remove unuse
d
extern
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io
C Hama
n
o
Mer
g
e
branch 'jn/gitweb
-
no-l
o
g
o'
into maint
commit
|
commitdiff
|
tree
2011-01-19
J
unio C
Hamano
Merge br
a
nch
'jk/diff-driver-
b
inary-doc' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hamano
Merg
e
b
r
a
n
ch 't
r
/s
u
bm
o
dule-
r
ela
t
ive-scp
-
url' into maint
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o
C Hamano
M
erge branch 'rj
/
ma
i
n
t-difftool-cygwin-wor
k
arou
n
d'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
e
r
g
e branch
'
rj/ma
i
n
t-
t
est
-
fixes' i
n
to maint
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C Hama
n
o
Merge branch 'jn/maint-gitw
e
b-pathinfo-fix
'
in
t
o
maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io
C
Ham
a
no
M
erge br
a
nch '
a
k/describe-exact' into maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C
Hamano
Merge branch 'jn/maint-fast-import-obje
c
t
-
reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hamano
M
e
rge b
r
anch 'jn/submodule-b-current'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-01-19
J
unio
C
H
a
mano
Merge br
a
nch '
j
c/ma
i
nt-svn-info-test-fix' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
e
rge
b
r
a
n
ch '
n
d/maint-relative'
i
nto maint
commit
|
commitdiff
|
tree
2011-01-19
Jonatha
n
Niede
r
Documentation
/
fast-i
m
port: put explan
a
tion of M
040000
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay Jones
svndump
.
c: F
i
x a printf format compiler
w
arning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Niede
r
r
emo
t
e-
e
xt
:
d
o
not segfault for bla
n
k lines
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next