repo.or.cz
/
git
/
jrn.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
Martin von Zwei
g
b
e
rgk
rebase: define options
i
n
O
PTION
S
_SPEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-25
Mart
i
n
v
o
n
Zweigbergk
Makef
i
l
e
: do not
install sourced rebase scr
i
p
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von Zweigb
e
rg
k
rebase: use @{up
s
tr
e
am}
i
f no upstream specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
wei
g
bergk
rebase
-i: re
m
ov
e
unnecessary
state
r
ebase-root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase -i: don't r
e
ad u
n
used va
r
iab
l
e preserve_merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigberg
k
gi
t
-rebase--am: r
e
move unnec
e
ssary --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
re
b
ase -
m
: d
o
n't print exit
c
ode 2 when merg
e
fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -m: r
e
me
m
b
e
r allow_
r
e
rere_autoupdate
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigber
g
k
r
ebas
e
: r
e
member
strat
e
gy and stra
t
e
g
y options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigbergk
rebase:
r
e
member verb
o
se optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Zweigbergk
rebase:
ext
r
act co
d
e for
writing basic state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwei
g
bergk
rebase: factor ou
t
s
ub command handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase: make -
v
a
tiny bit m
o
r
e
verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zw
e
i
g
bergk
rebase -i
:
align variable n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigber
g
k
reba
s
e: show consistent confl
i
ct resolution h
i
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase: ext
r
act am
c
o
de to new source file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebas
e
: ext
r
ac
t
merge code to new source file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: re
m
ove $branch as synonym for
$
orig_h
e
ad
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von
Z
weigbe
r
gk
re
b
ase -i: support
--st
a
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase: factor o
u
t
call to pre-rebase hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: factor out cl
e
an wo
r
k tree check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase: fa
c
tor
o
u
t
reference parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
on Z
w
eigbergk
rebase:
r
eorder validation steps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbe
r
gk
r
ebase -i: remove now u
n
nec
e
s
s
ar
y
d
i
rectory checks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n
v
on Zweig
b
er
g
k
rebas
e
: factor out
c
o
m
ma
n
d
line option processing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase: align variabl
e
content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigber
g
k
rebase: align variable names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von
Zweig
b
er
g
k
rebas
e
: str
i
ct
e
r check of sta
n
da
l
one sub comman
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Zweigbergk
rebase: act on
c
ommand
li
n
e ou
t
s
ide
p
arsi
n
g loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigbergk
rebase: im
p
rove d
e
tection of r
e
base in p
r
ogress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zwe
i
g
b
ergk
rebas
e
:
r
emove unused rebase stat
e
'prev_h
e
ad'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase: re
a
d state ou
t
side
loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: refact
o
r reading of state
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
Z
w
eigb
e
rg
k
rebase
:
clea
r
er names for direct
o
ry variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
J
unio C
H
amano
M
erge br
a
n
c
h
'tr/merge-u
n
born-clob
b
er'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merg
e
b
ranch 'jc/
u
npa
c
k-trees'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hamano
Mer
g
e
branch
'jc/fsck-fixes'
commit
|
commitdiff
|
tree
2011-02-10
J
u
n
io C Hamano
Merge branch 'tr/di
f
f-w
o
rds-test'
commit
|
commitdiff
|
tree
2011-02-10
J
u
n
io
C
Hamano
Merge
b
ranch 'rr/fi-import-marks-if-exists'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
Merge
b
r
anch 'jn/u
n
p
ack-l
s
tat-failur
e
-report'
commit
|
commitdiff
|
tree
2011-02-10
Junio C H
a
mano
Merge b
r
anch 'ef/alia
s
-v
i
a-run
-
command'
commit
|
commitdiff
|
tree
2011-02-10
J
unio C Hamano
Merge branch
'cb/setup'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
i
o
C Hamano
Merge branch 'ae/
b
etter-
t
empla
t
e-
f
a
i
lure-
r
epo
r
t'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ham
a
no
Merge branch 'jn/cherry-pick-
s
trategy
-
option'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ha
m
a
no
Mer
g
e branch '
m
ai
n
t-
1
.
7
.
0' into maint
commit
|
commitdiff
|
tree
2011-02-10
Jonathan
N
ieder
fast
-
import: introduce
"feature
n
otes" comma
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
J
onat
h
an Nieder
fast
-
import: clarify documen
t
ation of "feature"
co
m
mand
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öni
g
Documentation/
m
erge
subtre
e
How-To: fix ty
p
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jens Lehmann
pull: Docu
m
ent the
"
--[n
o
-
]
recu
r
se-submodules" options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jonatha
n
Niede
r
quote
.
h: simpli
f
y the inclusi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ng
ọ
c Duy
sha1_object_i
n
fo: examine cached_object stor
e
t
o
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
N
guy
ễ
n Thái Ng
ọ
c
Duy
sha1_file
.
c:
m
ove find_cached_object up so sha1_obje
c
t_i
n
fo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Ng
u
yễ
n
Thái Ngọc Duy
A
d
d const to pars
e
_{commi
t
,
ta
g
}_buffer()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguy
ễ
n Th
á
i Ngọc Duy
dif
f
:
s
upport -
-
cach
e
d on unborn branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jakub Nar
e
bs
k
i
gi
t
w
e
b:
Mention optional P
e
rl modules in
I
NSTALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sitaram Chamarty
post-recei
v
e-email: suppress error
if
d
escriptio
n
file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat
Thoyts
t7407
:
fix line endings for mingw build
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Sixt
t4120-apply-popt: hel
p
systems wi
t
h co
r
e
.
file
m
o
d
e
=
fals
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat T
h
oy
t
s
t3509: use un
c
onstrained initial t
e
st
to setup rep
o
sitory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Sixt
sta
r
t_command: fl
u
sh buffers in
the WIN
3
2 code path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sha
w
n O
.
Pearce
bu
n
dle: U
s
e
OFS_DEL
T
A
in b
u
ndle f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio
C Hamano
Merg
e
bran
c
h '
j
l/
f
etch-submo
d
ule-recursive' into ma
i
nt
commit
|
commitdiff
|
tree
2011-01-31
Jen
s
Le
h
mann
t5526:
Fi
x
w
r
ong ar
g
ument orde
r
in "git confi
g
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C H
a
mano
Git 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Ju
n
io C Hamano
f
sck: do not
giv
e
up too early in fsck_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio
C
Hamano
fsck: drop unuse
d
par
a
meter from t
r
averse_one_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tkac
D
on't pas
s
"--xh
t
ml" to hightlight in g
i
tweb
.
pe
r
l script
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-01-27
J
o
nathan Nieder
rebase -i: clarify in-editor do
c
um
e
ntat
i
o
n
of "exec"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
tests: san
i
t
ize mor
e
git environment v
a
riables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
Merge branch
'jn/fas
t
-import
-
empty-tree-remov
a
l'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonathan
Nieder
fast-imp
o
r
t
: treat filemodify with empty tree as del
e
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: give a
bett
e
r error mess
a
ge for bogus branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase
:
use explicit "
-
-
"
with chec
k
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
J
u
ni
o
C
Haman
o
G
i
t
1
.
7
.
4
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Ju
n
i
o
C Hamano
M
erge
b
ranc
h
'as
/
u
serd
i
ff-pascal'
commit
|
commitdiff
|
tree
2011-01-24
Juni
o
C Ham
a
n
o
Merge branc
h
'
j
n/s
e
tup-
f
ix
e
s'
commit
|
commitdiff
|
tree
2011-01-24
Jonathan Nieder
t1
5
1
0: fi
x
ty
p
o in the comme
n
t of a
t
e
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C
Hamano
Docu
m
entation updates for 'GIT_WO
R
K_T
R
EE without GIT_DI
R
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jona
t
ha
n
Nieder
Subjec
t
: set
u
p:
o
ffi
c
ially suppo
r
t --work-tre
e
with
o
ut
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nied
e
r
Documenta
t
i
on: do
n
ot trea
t
reset --keep as a sp
e
cia
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
Björ
n
S
tein
b
rin
k
Correctly report corr
u
pte
d
objec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonath
a
n
Niede
r
t
est
s
: compress the se
t
u
p tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan
N
i
eder
test
s
: cosmetic i
m
provements to the
rep
o
-
s
etup t
e
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-01-19
E
r
ik Faye-Lund
exec_cmd: re
m
ove un
u
sed exte
r
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o
C Hamano
Merge
b
ranch 'jn/git
w
e
b-n
o
-log
o
' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio
C Hamano
Merge branch 'jk/d
i
ff
-
driver-
b
inary-doc' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Haman
o
Mer
g
e b
r
anch '
t
r/su
b
mo
d
u
l
e
-rel
a
tive-scp-url
'
i
nto main
t
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hamano
Me
r
ge branch 'rj/ma
i
nt-di
f
ftool-cygwin-
w
o
r
karound
'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Haman
o
Merge br
a
nch 'rj/mai
n
t-test-
f
i
xes' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C Haman
o
Merg
e
branch 'j
n
/maint-gitweb-pathinfo-fix'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
i
o C
H
ama
n
o
Merge branch 'ak/describe-
e
xact
'
into
maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
i
o C
Ham
a
n
o
Merge bra
n
ch 'jn/mai
n
t-fast
-
impor
t
-object-re
u
se' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hamano
Merg
e
branch
'
jn
/
s
ubmodule-b-current' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Me
r
ge bra
n
ch 'jc
/
maint-svn-i
n
fo-te
s
t-fix' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
e
rge branch
'
nd/maint-r
e
lative' int
o
maint
commit
|
commitdiff
|
tree
2011-01-19
J
o
n
a
t
han
N
ieder
Documen
t
a
t
ion
/
fast-im
p
ort:
put ex
p
la
n
ation of M 04000
0
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ra
m
say Jones
svndum
p
.
c
:
F
i
x
a
p
rin
t
f
f
o
rm
a
t co
m
piler warn
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nieder
remote
-
ext: do 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