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: do not print lots of usage hints after an obvious error message
2011-06-29
Jo
h
annes
Six
t
r
ebase: do not pr
i
nt lots of
u
sag
e
h
i
nt
s
after a
n
obvious
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zweigbergk
r
e
b
a
s
e: define optio
n
s in OPTIONS_SPEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-25
Martin
v
on Zweigbergk
Ma
k
efi
l
e: do not install
s
ourced reb
a
se
sc
r
ipts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Zweigbergk
rebase: use @{upstream}
if
no u
p
stream specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Zweigbergk
rebase -i: remove unnecess
a
ry state rebase-root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zwe
i
g
b
e
r
g
k
r
ebase
-
i
: don't read unused variable
pre
s
erve_m
e
rges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git-rebase--am:
remo
v
e
unnece
s
sa
r
y --3way
optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
reb
a
se -
m
: don't print exit code 2 when merge fail
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
vo
n
Zweigbergk
rebase -
m
: rememb
e
r
allo
w
_rerere_autoupdate o
p
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
in
v
on Zwe
i
gbe
r
gk
reba
s
e: remembe
r
str
a
t
egy and strateg
y
opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweig
b
ergk
re
b
as
e
: remember ver
b
o
s
e option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: extr
a
ct
c
o
de f
o
r writing basic sta
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebas
e
: factor ou
t
sub command han
d
li
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zwei
g
bergk
rebas
e
: ma
k
e
-
v
a tiny bi
t
mo
r
e verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n vo
n
Zw
e
igbergk
r
eba
s
e -i: align v
a
r
iable
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigberg
k
rebase: show cons
i
stent co
n
flict resolution hint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
re
b
ase
:
extract
a
m
c
ode
t
o
n
e
w sour
c
e f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigbergk
rebase: extract
merge code to
n
ew
source
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase: remov
e
$
b
r
a
nch
a
s synonym
f
o
r $or
i
g_head
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von Zweigbergk
reb
a
se -i: support
--s
t
at
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zweigb
e
rgk
rebase: facto
r
o
u
t
call
t
o pre-rebas
e
hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
r
ebase
:
factor out cle
a
n work
tr
e
e
c
heck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwei
g
bergk
rebase
:
factor out
r
e
fe
r
e
n
c
e
parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
i
g
b
e
rgk
rebase: reorder validation st
e
ps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zw
e
igber
g
k
rebase -i: remo
v
e
now
unnecessary di
r
ecto
r
y che
c
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zweigbergk
reba
s
e: factor out co
m
mand line option processing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von
Zweigber
g
k
rebase:
a
l
i
gn
variable co
n
tent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: align
v
ariable names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: s
t
ric
t
er c
h
eck
of standal
o
ne sub
comm
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
reba
s
e: act on command line outside p
a
rsing lo
o
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n
Z
weigbergk
reb
a
se:
imp
r
ov
e
d
e
te
c
tion of rebas
e
in pr
o
gress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von
Zweigb
e
r
g
k
rebase:
r
emove
u
nused rebase state 'prev_head'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigberg
k
rebase: read state out
s
ide
loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigb
e
r
gk
r
e
ba
s
e: r
e
fac
t
or readin
g
o
f state
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwe
i
g
bergk
rebase: cl
e
arer
names
for directo
r
y variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Me
r
ge br
a
nch 'tr/me
r
ge-u
n
born-
c
lob
b
er'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io
C
Hamano
Merge branch 'jc/unpack
-
trees'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hamano
Merge b
r
anch
'jc/fsc
k
-fixe
s
'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge br
a
nch 'tr/di
f
f-w
o
rds-test'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Haman
o
Merge bra
n
c
h
'
rr/fi-imp
o
r
t-marks-if-exists'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o
C Hamano
Merge bran
c
h
'jn
/
unpack-lst
a
t-f
a
ilure-report'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hamano
Merge branc
h
'ef/alias-
v
i
a
-run-command'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Haman
o
Merge branch 'cb/setup'
commit
|
commitdiff
|
tree
2011-02-10
J
u
n
i
o
C Hamano
M
erge
branc
h
'ae/better-t
e
mplate-failure
-
r
eport'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hama
n
o
M
e
rg
e
bran
c
h 'jn
/
cherry-pick-st
r
ateg
y
-option
'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Hamano
Merge branch 'main
t
-
1
.
7
.
0' into ma
i
nt
commit
|
commitdiff
|
tree
2011-02-10
Jon
a
th
a
n Niede
r
f
a
st-i
m
por
t
: introd
u
ce "fe
a
tu
r
e
notes" comma
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Niede
r
fast-import: clarify docum
e
ntatio
n
o
f
"fea
t
ure" co
m
m
a
nd
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 Kle
i
ne-König
Document
a
tion/mer
g
e subtree 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-]recur
s
e-
s
ubmodules"
o
p
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nieder
quo
t
e
.
h: simplify the in
c
lusi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Th
á
i Ngọc
D
uy
sha1_object
_
info: examine
c
ac
h
e
d_ob
j
ect s
t
ore
t
oo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
N
g
uyễ
n
Thái Ngọc Duy
s
ha1_file
.
c: m
o
ve find_cached
_
obje
c
t
up so sh
a
1_objec
t
_info
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái
Ngọc
Duy
Add const to parse_{commit,t
a
g}_buf
f
e
r()
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
ed on unborn branch
e
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
Ja
k
ub
N
a
r
e
bski
gitweb:
Me
n
t
i
on optional
P
erl m
o
d
ules
in INS
T
A
L
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sitar
a
m Chamarty
post-receive-email: suppress error if descr
i
pti
o
n file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyt
s
t
74
0
7:
fix line
e
ndings
fo
r
m
i
ngw build
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Joh
a
nnes Sixt
t412
0
-app
l
y-popt: help s
y
stems with core
.
filemode=false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t3509: use
unc
o
n
s
trained
i
n
i
tial te
s
t t
o
setup reposit
o
ry
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Six
t
s
tart
_
com
m
a
n
d: flush
b
uffers in the WIN
3
2 code path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
S
h
a
w
n
O
.
Pear
c
e
bun
d
l
e
:
Use OFS_DELTA in bundle files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C
H
ama
n
o
Mer
g
e bran
c
h
'jl/fet
c
h-sub
m
odule-recursive' into maint
commit
|
commitdiff
|
tree
2011-01-31
Jens
L
ehmann
t5526: Fix w
r
ong
a
rgument or
d
e
r i
n
"g
i
t config"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Ju
n
io C Hamano
G
i
t 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
unio C Hamano
fsck: do no
t
give
u
p too early in
f
sck_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
nio
C
Hamano
fs
c
k: drop unused par
a
met
e
r
from trave
r
se_one_object(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tkac
D
o
n
'
t pass
"
-
-xhtml" t
o
hight
l
ight in gitweb
.
perl sc
r
ipt
.
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
Jonathan Nieder
rebase -i: clarify in-editor
d
ocume
n
ta
t
ion o
f
"
e
xec"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jef
f
King
tests: s
a
nitize mor
e
git environment v
a
ri
a
b
l
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
nio C Hama
n
o
M
e
rge
bran
c
h 'jn/fast-import-em
p
ty-tree-rem
o
val
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonath
a
n Niede
r
fast
-
import: treat filemodify with empt
y
tre
e
as
d
el
e
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
r
e
base: give a better error message for
bogus branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff K
i
n
g
rebase: u
s
e explicit
"
--
"
with checko
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
J
unio
C
Hamano
Git 1
.
7
.
4
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C
H
amano
Merge branch 'as/u
s
erdi
f
f-pa
s
cal'
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
M
e
r
g
e branch 'jn/setup-fi
x
es'
commit
|
commitdiff
|
tree
2011-01-24
Jonathan N
i
eder
t1510
:
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
Documentation upda
t
es for 'G
I
T_WORK_TREE without
G
IT_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nieder
Subject:
s
et
u
p: officially support --wor
k
-t
r
ee
without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonath
a
n
N
ieder
Documentation: do not treat re
s
et --k
e
ep as a speci
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
Björn Steinbrin
k
Corre
c
t
ly repor
t
corrupted objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan
N
i
e
der
tests: compress the setup test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nie
d
er
te
s
ts: cosmetic
i
mpr
o
vements
t
o
the r
e
po-setup test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C
Hamano
M
erge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2011-01-19
Erik Fay
e
-Lund
exe
c
_cm
d
: remo
v
e unused extern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hama
n
o
Merge branch 'jn/gitweb
-
no-logo' int
o
maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Mer
g
e
b
r
anch 'tr
/
submodule-relative-scp
-
url'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C
Hamano
Mer
g
e b
r
anc
h
'rj/maint-diff
t
ool-cygwin-workaround'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio
C Hamano
M
e
rge b
r
a
nch 'rj/maint-test-fixes' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hama
n
o
Me
r
g
e branch 'j
n
/ma
i
nt-g
i
t
w
eb-p
a
t
hinfo-fix' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-01-19
J
u
n
io C Hamano
M
er
g
e branch
'a
k
/describe
-
exact' into m
a
int
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
amano
Merge branch 'jn
/
maint-fast-import-object-reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hamano
Merge bran
c
h 'jn/sub
m
odule-b-
c
u
rr
e
nt' into
m
aint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ham
a
no
Merge branch 'jc/maint-svn-in
f
o-test-fix
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
erge bran
c
h 'nd/maint
-
relative' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-01-19
Jonatha
n
Niede
r
Documentation/fast-import
:
put explanation of M 040000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
R
a
msay J
o
nes
svndum
p
.
c: F
i
x a pr
i
ntf forma
t
compile
r
warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next