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
Martin von Zweigbergk
re
b
ase
:
def
i
ne options in OPTIONS_
S
PEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-25
M
a
rtin vo
n
Zweigbergk
Ma
k
efile: do no
t
ins
t
all sourced r
e
bas
e
scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwei
g
bergk
rebase: use @{ups
t
ream} if
n
o upst
r
eam spec
i
fied
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
in von Zweig
b
er
g
k
r
ebase -i: remove unnece
s
s
ary s
t
ate rebase-root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
i
g
bergk
re
b
ase
-
i: don't read unused variable p
r
eserv
e
_me
r
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git-
r
ebase--am: remov
e
unnece
s
sary --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
vo
n
Zweigbergk
rebase -
m
:
d
on't prin
t
exit code 2 when
m
er
g
e fa
i
ls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwe
i
gbergk
r
e
base
-
m: r
e
m
e
m
b
er allow_rerere_autoupdate option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
i
gberg
k
r
e
b
ase:
r
e
m
ember strategy and s
t
rategy options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase: remember
v
e
rbose option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von Z
w
eigb
e
r
g
k
rebase: ex
t
ract code for wr
i
ting basi
c
state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: f
a
ct
o
r out sub c
o
mmand handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Zweigbe
r
gk
r
e
base: make -v
a
tiny bi
t
m
or
e
verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zwe
i
gbergk
rebase
-
i:
a
lign variable names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbe
r
gk
rebase: show consistent conf
l
ict resolution hi
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zwe
i
gberg
k
r
ebase: extract am code to new so
u
r
ce file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract me
r
g
e cod
e
to new
s
o
u
rce f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwei
g
bergk
r
e
b
ase: remove $
b
ra
n
ch
as synonym for $orig_head
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweig
b
ergk
r
e
base -i:
s
upport --stat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
re
b
ase: fac
t
or o
u
t call t
o
pre-r
e
base hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in
v
o
n Zweigb
e
rgk
reba
s
e: factor
o
ut clean wo
r
k tr
e
e chec
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eig
b
ergk
rebase: factor out reference parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igb
e
rg
k
r
e
b
ase
:
re
o
rder v
a
lidation steps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zweigber
g
k
re
b
ase -i: rem
o
ve now unnecessary director
y
checks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase:
f
actor ou
t
command l
i
ne
o
p
tion process
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
r
e
base: align
variable content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zw
e
i
g
be
r
g
k
reba
s
e: align variab
l
e names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
o
n Zwei
g
bergk
reba
s
e: st
r
ic
t
er check of standalone su
b
command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: act on comm
a
nd line
outside parsing lo
o
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweig
b
ergk
r
ebase: impr
o
ve detection
of rebas
e
i
n prog
r
es
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
vo
n
Zwe
i
g
b
er
g
k
rebase:
r
emove unused reb
a
s
e
state
'
prev_he
a
d'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbe
r
gk
rebase: read state outside loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: refactor
re
a
d
ing of
s
tate
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
in von Zweigbergk
rebase: clearer names for dir
e
ctory var
i
ab
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Junio C Haman
o
Merge b
r
anch 'tr/merge-unborn-clobbe
r
'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ham
a
n
o
M
e
rge
b
r
anch 'jc/unpack
-
tr
e
es'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
Merge branch 'jc/fsck-fixe
s
'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o
C
Hamano
Merge br
a
nch 'tr/diff-words-
t
est'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hamano
Merge b
r
anch 'rr/fi-
i
mport-m
a
rks-
i
f-exists'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hamano
Merge b
r
anch 'jn/unp
a
ck-lstat-fai
l
ure-
r
eport
'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge
br
a
nch 'ef/al
i
as-via-run-command'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hama
n
o
Merge bra
n
ch
'
cb
/
s
e
tup'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
Merge
b
ranch 'ae/better-t
e
mpla
t
e-fa
i
lure-repo
r
t'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'jn
/
ch
e
rry-pick-stra
t
egy-option'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hama
n
o
Merge
branch '
m
aint-1
.
7
.
0' into maint
commit
|
commitdiff
|
tree
2011-02-10
J
onathan Nieder
fa
s
t-impo
r
t:
i
ntroduc
e
"feature no
t
e
s
" comm
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jo
n
at
h
an Nieder
fast-import: clar
i
fy docume
n
t
ation of
"
f
e
at
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
ument
a
tion/me
r
ge subtree How-
T
o: fix ty
p
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jens Lehmann
pull: Documen
t
the
"--[no-]recurse-
s
ubmodule
s
"
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nieder
quote
.
h
:
simp
l
ify th
e
inclusion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễ
n
T
hái
N
gọc Duy
sh
a
1_obje
c
t_info: examin
e
cached_
o
bject sto
r
e too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ng
ọ
c Duy
s
ha1_file
.
c: move find_cached_object up so sha
1
_object_i
n
fo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ngọc
Duy
Ad
d
const to
p
arse_{commit,t
a
g
}_buffer()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ng
ọ
c Duy
diff: support
-
-cac
h
e
d on unborn b
r
anche
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jaku
b
Narebs
k
i
gitwe
b
: Men
t
ion optional Perl
m
o
dules in INS
T
A
L
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Si
t
a
ram Cham
a
rty
pos
t
-re
c
eive-email: suppress
e
rror if des
c
ript
i
on file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t7407: f
i
x line
e
n
dings
f
o
r mingw bui
l
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johan
n
es Si
x
t
t4120-
a
pply-po
p
t
:
he
l
p
s
ystems with core
.
filemode=false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyt
s
t3509: u
s
e
unconst
r
ained
i
nitial test
to se
t
up repository
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jo
h
annes Sixt
s
t
art_command: flush buffers in t
h
e WIN32 code
p
ath
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Shawn
O
.
Pear
c
e
b
u
ndle: Use OFS_DELTA in bun
d
le
f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio
C
Hamano
Merge b
r
anc
h
'jl/fetch-submodule-recur
s
ive' in
t
o maint
commit
|
commitdiff
|
tree
2011-01-31
Jens Lehmann
t5526: Fi
x
wro
n
g ar
g
ument or
d
er in "
g
it config"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Hamano
G
it 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Ju
n
io C H
a
mano
fsck: do not give up
t
oo
e
arly
i
n
fsck_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
nio C Ham
a
no
fsck: d
r
op unused parameter from tr
a
verse_one_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tkac
Don't pass "--xhtm
l
"
t
o
hightlight in git
w
eb
.
p
e
r
l
script
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
nio
C
H
amano
M
e
r
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2011-01-27
Jona
t
han
Nieder
reba
s
e -i:
c
l
ar
i
fy in-e
d
itor documentation of "ex
e
c
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
tests: sanitize more git environment variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Ha
m
ano
Mer
g
e branch 'jn/fast-
i
m
port-e
m
pty-tree-remo
v
al' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Nieder
f
as
t
-import: t
r
eat filemod
i
fy with empty tree as delete
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
e
ff King
rebase:
give a bett
e
r error message for bogus bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
e
ff King
r
e
base: use
e
x
p
l
icit "--" with
checkout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Jun
i
o C
H
amano
Git 1
.
7
.
4-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
M
e
rge br
a
nch 'as/use
r
diff-pas
c
al'
commit
|
commitdiff
|
tree
2011-01-24
Junio C Ham
a
no
M
e
rge bran
c
h 'jn/setup-fixes'
commit
|
commitdiff
|
tree
2011-01-24
Jonathan Nie
d
er
t1510: fix typo in
th
e
c
o
mment of a test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Doc
u
mentatio
n
upd
a
tes f
o
r 'GIT_WORK_TREE wit
h
out
G
IT_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nied
e
r
S
ubjec
t
: setup:
officially sup
p
ort --w
o
rk-tree without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Ni
e
der
D
ocumen
t
ation:
do not
t
rea
t
res
e
t -
-
keep as a
s
pe
c
ia
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
Björn
St
e
inbr
i
nk
Correctly report corr
u
pted
objec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan N
i
eder
tests: compress the
s
etup
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jon
a
than Nieder
t
e
s
ts: cosm
e
tic im
p
rove
m
e
nts
t
o
t
h
e
repo-setup test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge
b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2011-01-19
E
r
ik Faye
-
L
u
nd
ex
e
c_cmd:
r
emove
unus
e
d extern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge
b
ranch '
j
n/gitweb-n
o
-logo
'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C Ha
m
ano
Me
r
ge
branch 'jk/diff-dr
i
v
er
-
binary-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C H
a
mano
Merge branc
h
'
tr/submodule-re
l
a
tive-s
c
p-
u
rl' in
t
o main
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge bran
c
h
'
rj/maint-difftoo
l
-
c
y
gwin-worka
r
ound'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C Ha
m
an
o
Merge branc
h
'rj/mai
n
t
-
tes
t
-
f
ixes' in
t
o maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge bran
c
h 'jn/maint-gitw
e
b-pathinfo-fix
'
int
o
maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C
Hamano
M
er
g
e branch 'ak/d
e
s
c
ribe-ex
a
ct' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge b
r
anch
'jn/maint
-
fast-im
p
or
t
-
o
bj
e
ct
-
reuse
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
amano
Merge branch 'j
n
/submodule-b-cur
r
ent' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Haman
o
Merge branch 'jc/main
t
-svn-inf
o
-
t
est-f
i
x' into
maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge br
a
nch 'nd
/
maint-rel
a
tive'
int
o
maint
commit
|
commitdiff
|
tree
2011-01-19
Jon
a
than Nieder
Documentation/fa
s
t-i
m
p
o
r
t
: pu
t
explanation of M 040000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay Jon
e
s
svn
d
u
m
p
.
c
:
F
i
x a printf
f
ormat compiler warn
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonatha
n
Nie
d
e
r
remote-e
x
t: do not
s
e
gf
a
ult for b
l
ank
l
i
nes
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next