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
rebase: define options in OPTIONS_SPEC
2011-03-05
M
artin vo
n
Zw
e
igberg
k
re
b
ase: define options in
OPTIONS_SPEC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-25
Martin von Z
w
eig
b
ergk
Makefile
:
do not inst
a
ll sour
c
e
d reb
a
s
e s
c
r
ipts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
i
g
b
ergk
reb
a
se: use @{upstrea
m
} if no upstream
s
pecified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase -i: remove unnecessary state
rebase-root
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
o
n
Z
weigbergk
r
ebase -i: don't read unused va
r
i
able preserve_
m
erges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigber
g
k
g
i
t-rebase--am: remo
v
e unnecess
a
ry
-
-
3
way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
on Zweigbergk
r
e
base -m
:
don't print exi
t
co
d
e 2
w
h
en merg
e
fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
r
ebase -m:
r
emember a
l
low_rer
e
re_autoupdate option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
igberg
k
rebase:
r
e
m
ember strategy and strategy op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigb
e
rgk
reb
a
s
e
: remember ver
b
ose option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
i
g
berg
k
r
ebase
:
extract
c
ode
for
wri
t
in
g
b
asic state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von
Z
wei
g
be
r
gk
r
e
base: factor out
s
u
b
c
ommand ha
n
dling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigb
e
rgk
r
ebase: ma
k
e
-v a tiny bit more verbose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigber
g
k
rebase -i: align variable names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Z
weigbergk
re
b
ase: sh
o
w consistent conflict resolution hint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Zweigbergk
rebase: extr
a
ct am
c
o
d
e to new source
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
re
b
ase: extract mer
g
e code
to new source f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigb
e
r
g
k
rebas
e
: remove $b
r
anc
h
as s
y
n
o
nym for $orig_head
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase -i: support --stat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gberg
k
r
e
b
ase
:
f
act
o
r out call to pre-rebas
e
hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
v
o
n Zwei
g
bergk
rebase: factor out clean
w
ork tree check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
vo
n
Zw
e
igbergk
r
ebase: fa
c
t
or out
reference pa
r
sing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
v
o
n Zw
e
igbergk
reba
s
e: r
e
order validat
i
on
s
t
eps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigb
e
rgk
reb
a
s
e
-i: remove now u
n
necessary
d
irecto
r
y c
h
ecks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Z
w
eigberg
k
rebase: factor out command lin
e
option processing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweig
b
ergk
rebase:
a
l
i
gn varia
b
l
e
conte
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase: align variable nam
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: stricter check of sta
n
dalone
sub comman
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weig
b
ergk
r
ebase: act on command lin
e
outsi
d
e
p
a
rsing loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zwei
g
be
r
g
k
rebase: improve detection of rebase i
n
p
r
og
r
es
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweig
b
ergk
rebase: remove unused rebase state 'prev_head'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
rebase: read
state outsid
e
loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Z
wei
g
b
e
rgk
re
b
ase: refactor read
i
n
g
of sta
t
e
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von
Z
weigbergk
reb
a
se: clearer
na
m
es for directory var
i
ables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
erg
e
bra
n
ch 'tr/merg
e
-unborn-clobber'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
H
a
mano
Me
r
g
e
b
ranch 'jc/unpack-trees'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
M
e
rge branc
h
'jc/fsck-fixes
'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
Merge branch 'tr
/
diff-words-test'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge bran
c
h 'rr/fi-import-marks-i
f
-exists'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hamano
M
erge bra
n
ch
'
jn/unpack-lstat-
f
ailu
r
e
-
report'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hamano
Merge branch 'ef/alias-
v
ia
-
ru
n
-command'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge bran
c
h 'cb/setup'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Hamano
Merge branch '
a
e
/
better-template-failure-report'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Mer
g
e b
r
anch '
j
n/
c
herry-pick-strategy-opti
o
n'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io C Hamano
Merge
branch 'm
a
i
n
t-1
.
7
.
0' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nie
d
er
fast-import
:
i
ntrod
u
ce "f
e
a
t
ure notes" command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nied
e
r
f
ast-import: c
l
arify documentation of "fea
t
ure" 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 Klei
n
e
-
K
önig
Documentation/merge subtre
e
How-To: fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jens Lehmann
pull: Document the "--[no
-
]recurs
e
-submodules" o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nie
d
er
quote
.
h: simplify the incl
u
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễ
n
T
hái N
g
ọc
Duy
sha1_object_info
:
examin
e
cached_o
b
ject store to
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ng
ọ
c Duy
sha1_file
.
c:
m
o
ve find_cached_object
up
so sha1_ob
j
ect_info
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ngọc D
u
y
A
d
d
c
onst to parse_{commit,
t
ag}_buffer()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễ
n
Thái
N
gọc Duy
d
i
ff: su
p
p
ort --cached on u
n
born
b
ranches
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
N
a
r
e
b
ski
gitwe
b
: Mention op
t
ion
a
l
P
erl modules in
I
NS
T
ALL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Sitaram Chamarty
post-receiv
e
-email: suppr
e
ss e
r
ror
if descrip
t
i
o
n
f
ile
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat
Thoyts
t7407: fix line end
i
ngs for mingw b
u
ild
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Joh
a
nnes Si
x
t
t4120-apply-popt:
h
elp
s
y
s
tems
w
ith
core
.
f
i
l
e
mo
d
e=false
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t3509: use unconstrained initi
a
l
test to setup re
p
ository
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
J
o
hann
e
s Sixt
start_c
o
mmand: flush buffers in the WIN32 code pat
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Shawn O
.
Pearce
bundle: Use OFS_DELTA in bun
d
le files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
Junio C H
a
mano
M
e
rg
e
branc
h
'jl/fetch-submodu
l
e-recursive' into maint
commit
|
commitdiff
|
tree
2011-01-31
Je
n
s Lehmann
t5526: Fi
x
wr
o
ng arg
u
me
n
t
o
rde
r
in "git
config"
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
Junio C Hamano
fsck: do not give u
p
too ea
r
ly
in fsck_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio
C Hamano
fsck: dro
p
unused
p
ar
a
meter from trave
r
se_one_object()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tkac
Don't
p
ass "--xhtml" to
h
ightlight
i
n gitweb
.
perl
s
c
ript
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jun
i
o C Hamano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Ni
e
der
rebase -i: clarify in-editor do
c
u
m
entation of
"exec
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f K
i
ng
t
ests: sani
t
i
z
e more git environme
n
t variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio C
H
amano
M
e
rge branch
'
j
n
/fast-impor
t
-
e
mpty-tree-r
e
moval' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonatha
n
Nieder
fast-import: trea
t
filemodify with
e
m
p
ty
tr
e
e as delet
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: give a better error message for
b
ogus branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
r
e
base: us
e
explic
i
t
"
--
"
with c
h
eckout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Ham
a
no
G
it
1
.
7
.
4-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Merge branch 'as
/
u
serdiff-pascal
'
commit
|
commitdiff
|
tree
2011-01-24
Juni
o
C
Hamano
Me
r
ge
b
r
a
nch
'jn/s
e
tup-fixes'
commit
|
commitdiff
|
tree
2011-01-24
J
o
nathan Nieder
t
151
0
: fix typo
i
n the
comment of a test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Documentati
o
n updates
for 'GIT
_
WO
R
K_
T
REE w
i
thout GIT_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jona
t
han N
i
e
d
e
r
Subject: se
t
up: officially supp
o
rt --work-tr
e
e without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nieder
D
o
cumentation: do
n
o
t
tre
a
t
reset --keep as a
sp
e
cial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-20
Bj
ö
r
n
Stein
b
ri
n
k
C
o
rrectly repo
r
t
corrupt
e
d objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan N
i
e
d
er
test
s
: compress the setup tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
tests: cosmetic improveme
n
ts to
th
e
r
e
po
-
s
etup test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-01-19
E
r
ik Fa
y
e-Lun
d
ex
e
c_cmd: remove unused extern
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge
branch 'jn/g
i
tweb-no-
l
o
g
o
'
into m
a
int
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
e
r
g
e branch '
j
k/d
i
ff-d
r
iver-b
i
na
r
y-d
o
c
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch 'tr/su
b
module-relativ
e
-
scp
-
u
rl' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Ha
m
ano
Merge b
r
anch 'rj/mai
n
t-difftool-cygwin-wor
k
ar
o
und'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ha
m
ano
Me
r
ge branch 'rj/m
a
int-
t
est
-
fixes' into m
a
int
commit
|
commitdiff
|
tree
2011-01-19
Junio C Haman
o
Merge
b
ranch 'j
n
/mai
n
t-gitweb-pathinfo-fix
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C Hamano
M
erge branch '
a
k/de
s
cri
b
e-exact
'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Haman
o
Merge branch 'jn/maint-fa
s
t
-
import-
o
b
ject-reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch
'
jn/submodule-b-current' into mai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ha
m
an
o
M
e
rge b
r
anc
h
'
j
c
/m
a
i
nt-svn-info-test
-
f
i
x'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C H
a
mano
Merge branch 'nd/maint-relative' into maint
commit
|
commitdiff
|
tree
2011-01-19
Jonathan
N
ieder
Documentation/fast-im
p
ort:
p
ut expl
a
nation
o
f M 04000
0
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay Jones
svndump
.
c
: Fix a prin
t
f format compiler warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nied
e
r
r
e
mote-ex
t
: do not se
g
fault for
b
lank lines
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next