repo.or.cz
/
git
/
dscho.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
r
ebase: define
options in OPTIONS
_
SPEC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-25
Mart
i
n von
Z
weigbergk
M
a
kefile: d
o
not inst
a
ll sourced rebase script
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: use
@
{upstream} if no upstre
a
m specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zw
e
igbergk
r
ebase -i: remove
u
nnecessary state rebase-root
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Z
weigbergk
reb
a
se -
i
: don't
r
ead unused variable p
r
es
e
rv
e
_merge
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
gi
t
-rebase--am: remove unneces
s
ar
y
--3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e -m: d
o
n't print exit code
2 whe
n
m
e
r
g
e fail
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
i
gbergk
rebase
-m:
r
e
member allow_rerere_autoupdate option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Z
w
eigbergk
rebas
e
: rem
e
m
b
er strategy and str
a
tegy option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
b
ase:
rem
e
mber verbose option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zw
e
igber
g
k
rebase: extra
c
t c
o
de
for writing basic
s
tate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out sub com
m
and handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase:
make -v a tiny bit more verbose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zweigbergk
rebase
-i: align variab
l
e names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zw
e
igbergk
rebase
:
show consisten
t
conflict resolution hint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Zwe
i
gb
e
rgk
rebase:
e
xtract am cod
e
t
o
n
e
w source
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: extract merge
c
o
de to new source file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigb
e
rg
k
rebase: remove $branch as
synonym for $orig_
h
e
a
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
re
b
as
e
-i: support
-
-s
t
at
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Z
w
eigbergk
r
e
base: factor out call to p
r
e
-r
e
base hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase:
factor out clean work t
r
ee check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbe
r
gk
rebase: factor out re
f
erence parsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbe
r
g
k
r
e
base: re
o
rder va
l
ida
t
ion st
e
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von
Zweigbergk
rebase -i:
rem
o
v
e
now unnec
e
ssa
r
y
direc
t
ory c
h
ecks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zwe
i
gbergk
rebase: factor
out comman
d
line option pro
c
essing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
ber
g
k
rebase: align variable content
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
in
v
o
n Zweigbergk
rebas
e
:
alig
n
var
i
ab
l
e nam
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwe
i
g
ber
g
k
rebase: st
r
icte
r
check o
f
stan
d
al
o
ne su
b
command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbe
r
g
k
rebase: act on
c
omm
a
nd
line outside
p
a
rsi
n
g
loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweig
b
erg
k
rebas
e
: improve dete
c
t
i
on of
rebase
i
n pro
g
re
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
r
e
base:
r
e
m
ove unused rebase state 'prev_
h
ea
d
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigber
g
k
rebase: read st
a
te outside loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbe
r
gk
rebase: refac
t
o
r reading of st
a
te
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 Zwei
g
ber
g
k
rebase: c
l
earer na
m
e
s for direc
t
ory va
r
iables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Haman
o
Merge branch 'tr/merge
-
unborn-cl
o
bber'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Haman
o
M
erge branch 'jc/unpack-
t
rees'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Ha
m
ano
Merge
b
r
anch 'jc/fsck
-
fixes'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io C Hamano
Merge bra
n
ch 'tr/diff-word
s
-test'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hamano
Merge branch '
r
r/fi-import-ma
r
ks-
i
f
-exists'
commit
|
commitdiff
|
tree
2011-02-10
Junio C
Hamano
M
erge branch 'jn/unpack-l
s
t
a
t
-failure-re
p
or
t
'
commit
|
commitdiff
|
tree
2011-02-10
J
unio C Hamano
Merge branch
'
e
f/alia
s
-v
i
a
-
run-command'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Me
r
ge branch 'cb/s
e
tup'
commit
|
commitdiff
|
tree
2011-02-10
Junio C
Hamano
Merge branch 'ae/better-template-
f
ai
l
u
r
e-r
e
port'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
i
o
C
Hamano
Merg
e
bran
c
h 'jn/
c
herry-p
i
ck-s
t
rat
e
gy-o
p
tion'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io
C
Hamano
Merge branch 'ma
i
nt
-
1
.
7
.
0'
int
o
m
a
int
commit
|
commitdiff
|
tree
2011-02-10
Jon
a
th
a
n Nieder
f
ast-import: introdu
c
e "feature notes" command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Niede
r
fast-import: cl
a
rify
d
ocumen
t
a
t
i
o
n of "featur
e
"
c
om
m
and
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-09
U
w
e
K
leine-König
Documentation/merge subtree
How-To:
fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
J
e
ns Lehman
n
pull: Document the "--[no-]recurse-submodules"
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nieder
quote
.
h:
simplify the
inclusion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái
Ngọc Duy
sha1
_
object_info: examine cached_object store too
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
:
move find_cached_object up
so sha1_o
b
ject_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
Add const to p
a
rs
e
_{co
m
mit,
t
ag}_
b
uffer
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễ
n
Thái
N
gọc Duy
diff: support --c
a
ched
o
n
u
nbo
r
n bra
n
ches
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 Narebski
gitweb: Mention optio
n
a
l Per
l
modules in IN
S
TALL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Si
t
aram Chamarty
post-receive-email: suppress error
if descript
i
on fil
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat T
h
oy
t
s
t7407: fix line endings for mingw build
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Johann
e
s Sixt
t4120
-
ap
p
ly-popt: help
s
yste
m
s
with core
.
f
i
l
emode
=
false
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t3509: use
uncons
t
rained in
i
tial test to setup repository
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Si
x
t
start_command: flush buffe
r
s in the WIN32
c
ode path
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
S
h
awn O
.
Pear
c
e
bun
d
le:
Us
e
O
FS_DELTA in b
u
n
dle f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
Junio
C Hamano
Merge
b
ra
n
c
h 'jl/fetch-subm
o
dule
-
recu
r
sive' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2011-01-31
Jens Lehmann
t5526: Fix wrong a
r
gu
m
e
nt
o
rder
in "git config"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
J
unio C
H
amano
G
i
t 1
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
J
uni
o
C
H
a
ma
n
o
fsck: do not give up
t
oo early i
n
f
sc
k
_
dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio
C
Hama
n
o
fsck
:
drop u
n
u
s
e
d paramete
r
from traver
s
e_o
n
e_obj
e
ct()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
A
dam Tkac
Don't pass "--xhtml" to
h
ightlight in gitweb
.
perl script
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
J
unio C Hamano
Me
r
ge
b
ra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Nieder
rebas
e
-i: clari
f
y i
n
-edit
o
r
documentati
o
n
o
f
"e
x
ec"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
test
s
: sani
t
ize
more git environment varia
b
les
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/fa
s
t
-im
p
o
r
t-empty-tree-remova
l
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Nieder
fast-
i
mpor
t
: treat
f
ilemodi
f
y
with empty
t
r
ee as
dele
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
reb
a
se: giv
e
a better e
r
r
o
r mes
s
a
g
e f
o
r bog
u
s br
a
nc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase
:
us
e
e
x
p
licit "-
-
" with chec
k
ou
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Ha
m
ano
Git 1
.
7
.
4
-
r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Ham
a
no
Merge b
r
anch 'as/userdiff-pascal'
commit
|
commitdiff
|
tree
2011-01-24
Junio C
H
amano
Merge
bran
c
h 'jn/setu
p
-fixes'
commit
|
commitdiff
|
tree
2011-01-24
J
onathan N
i
eder
t15
1
0: fix t
y
po in the comment of a
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Juni
o
C
H
amano
Documentation updates for 'GI
T
_WORK_
T
REE without
GIT_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nied
e
r
Sub
j
ect: setup: o
f
ficially support --work-tr
e
e without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nie
d
er
Doc
u
mentation:
do not t
r
eat
r
eset
--keep as a speci
a
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-20
Björn S
t
einbrink
Correctly report corrupted objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Niede
r
tests: c
o
m
p
ress the setup tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jonath
a
n N
i
eder
tests: cosmeti
c
improveme
n
ts
to the r
e
p
o
-s
e
tup te
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Junio C H
a
mano
M
e
rg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2011-01-19
Erik
Faye-Lund
exec_c
m
d:
re
m
ove unused extern
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hamano
Me
r
ge bran
c
h 'jn/gitweb-no-logo' i
n
to m
a
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C Hamano
Merg
e
b
ra
n
c
h
'jk/
d
iff-d
r
iver-binary-doc
'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch
'tr
/
s
u
bmodule-relative-scp-url' in
t
o maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch '
r
j/maint-difftool-cygwin-w
o
rkar
o
und
'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Hamano
M
e
rg
e
branc
h
'
rj/maint-tes
t
-fixes' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch '
j
n
/
maint-gitw
e
b-pat
h
i
n
fo-f
i
x'
i
nto maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch 'ak/
d
escribe-exac
t
' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C Hamano
Merge branc
h
'jn
/
ma
i
nt-fast-im
p
ort-o
b
ject-
r
eus
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
J
unio C
Hamano
Me
r
g
e
b
ra
n
ch 'jn/submodule-b-c
u
rrent' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge br
a
nch 'jc/maint-sv
n
-info-test-fix' into maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
i
o
C Hamano
M
erge branch 'n
d
/maint
-
r
elative' int
o
maint
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nied
e
r
Documentation/fast-
i
mport
:
put explanation of M 04000
0
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay Jo
n
e
s
svndump
.
c: Fix a print
f
format compiler warni
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jo
n
athan Ni
e
der
r
e
mote-ext:
d
o not
segfault for blank lines
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next