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: use @{upstream} if no upstream specified
2011-02-10
Martin vo
n
Zweigbergk
rebase:
use @{up
s
t
r
eam
}
if no upstrea
m
speci
f
ie
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
reba
s
e -i: rem
o
ve
u
nn
e
cessary state rebase-root
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase -i: don't read
u
nused variable prese
r
ve_merg
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
o
n Zweigbergk
git-reba
s
e--
a
m
: remov
e
unnecessary
-
-3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigbergk
re
b
ase -m: don't
p
rin
t
exi
t
cod
e
2 w
h
en
m
e
r
ge fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Zweigbergk
reba
s
e -m: rem
e
m
b
er
allow_rerere_a
u
toupdate option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigberg
k
re
b
ase: remember str
a
t
e
gy and
s
trategy options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
re
b
ase:
r
emember verbo
s
e option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
se:
e
xtract code for wr
i
ting
basic state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase:
f
ac
t
or out su
b
command handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: make -v
a
tiny bit more
v
erbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin v
o
n
Z
weigbergk
rebase
-i
:
ali
g
n var
i
able
name
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zweigbergk
reb
a
se: show consistent co
n
fli
c
t res
o
l
u
tion h
i
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Z
w
eigbergk
rebase: e
x
t
r
act
am code
t
o
n
e
w sou
r
ce file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwei
g
bergk
reb
a
se: extract merge code to new
s
o
u
rce f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweigbergk
re
b
ase: remove $bran
c
h as synonym
for $or
i
g_head
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zwe
i
gbergk
reb
a
se -i: support --stat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigber
g
k
rebas
e
: facto
r
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 Z
w
eigb
e
rgk
rebase: factor
o
ut
cle
a
n work tree check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
e
r
gk
rebase: fa
c
tor out
referenc
e
pa
r
s
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase
:
reorder
va
l
idation steps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase -i: remove now unnece
s
sary dire
c
t
o
ry c
h
ecks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
reb
a
se: factor out
com
m
and
line option processing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwe
i
g
b
ergk
reb
a
se:
a
lign vari
a
b
l
e content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: align variable name
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbe
r
gk
re
b
ase
:
s
t
ricter
c
h
e
c
k
of stand
a
lone
s
ub co
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwe
i
gbergk
r
ebase: act on command
l
ine outside
pa
r
si
n
g
lo
o
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
reb
a
se: improve detection of reba
s
e in progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zw
e
igbergk
re
b
ase: rem
o
v
e unused re
b
ase state 'prev_head'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase
:
read state outside loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weig
b
ergk
r
ebase:
r
e
fac
t
o
r readi
n
g o
f
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
Mar
t
in von Zw
e
igbergk
rebase: cle
a
r
e
r
n
ames fo
r
di
r
ectory varia
b
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ham
a
no
Merge b
r
anch
'tr/merge-unborn
-
clobb
e
r'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Mer
g
e branc
h
'
jc/u
n
pack-tree
s
'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
Merge branch 'jc/f
s
ck-fixes'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Ha
m
a
n
o
Merge
bra
n
ch
'
tr
/
diff-words-test'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
i
o
C
H
amano
Merge
branch 'rr/fi-import-marks-if-
e
xists
'
commit
|
commitdiff
|
tree
2011-02-10
J
u
n
i
o C
H
a
man
o
Mer
g
e b
r
anch 'jn/u
n
p
a
ck-lst
a
t-failure-
r
eport'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
Merge branch 'ef/a
l
ias-via-
r
un-comm
a
nd'
commit
|
commitdiff
|
tree
2011-02-10
Junio C
H
aman
o
Merge branch 'cb/
s
et
u
p'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'ae/better-
t
emplate-f
a
i
l
u
r
e-r
e
port'
commit
|
commitdiff
|
tree
2011-02-10
J
unio C Hama
n
o
Me
r
ge branch 'jn/cherry-pick-strategy-o
p
tion'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Ha
m
ano
Mer
g
e branch
'
maint-1
.
7
.
0' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nieder
fast-
i
mport
:
i
n
t
roduc
e
"feature notes" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonath
a
n Nieder
fast-im
p
ort
:
clarify documentation o
f
"feature" comma
n
d
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
Documentation/merge subtree How-To: fix
t
ypo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jens
L
eh
m
ann
p
u
ll:
D
ocument
t
h
e
"--[no-]
r
ecu
r
se-subm
o
dul
e
s" options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jonatha
n
N
ieder
quot
e
.
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_
i
n
fo: examine cac
h
ed_object store too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn T
h
á
i
Ngọc Duy
sha
1
_
file
.
c
: m
o
ve
f
i
nd_
c
ached_object u
p
so sha1
_
object_inf
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn
Thái N
g
ọc
Duy
Add const to parse_{commit,ta
g
}_buffer(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
N
guyễ
n
Thá
i
Ngọ
c
D
u
y
diff: support -
-
cac
h
ed on un
b
orn
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
J
akub Narebski
gitweb: Mention optiona
l
Perl modules i
n
INSTALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sitara
m
Chamarty
post-rece
i
v
e-emai
l
:
s
uppress error if
descri
p
tio
n
file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat
Thoyts
t
7
4
07: fix
l
ine endings for ming
w
b
uild
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jo
h
a
nnes Sixt
t4
1
2
0
-
a
pp
l
y-pop
t
: help syst
e
ms with core
.
file
m
ode=false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
P
a
t Tho
y
ts
t
3
5
0
9: use
u
nconstrained initia
l
test to setup re
p
ository
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
J
ohannes
S
ixt
start
_
command: f
l
ush buf
f
ers in the WIN32 cod
e
pa
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sh
a
w
n O
.
P
e
arce
bundle: Use OFS
_
DELTA
i
n bundle file
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Ham
a
no
M
erge
b
ranch 'jl/fetch-submodule-recursive' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-01-31
Jens Le
h
mann
t5
5
26:
F
ix wrong argument order 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 Hama
n
o
fsck: do
n
ot give up too
ear
l
y
i
n fsck_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hama
n
o
fsck: drop
u
nused parameter from t
r
averse_one_obj
e
c
t
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tka
c
D
o
n't pass "--x
h
tml
"
to hightlight in
g
itweb
.
pe
r
l
scrip
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Nieder
reb
a
se -
i
: clarify
i
n
-
edi
t
or documentation of "exec"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff
King
tests: san
i
tiz
e
m
o
re
g
it environ
m
ent var
i
ables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C H
a
mano
Merge br
a
nch 'jn/fast-import-empty-tree-removal
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jon
a
th
a
n Nieder
fa
s
t-import: treat filem
o
dify with
e
mpty
t
ree as del
e
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: give a b
e
tter error messag
e
for bogus
branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: use explicit "--" wi
t
h checkou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
J
unio C Ha
m
ano
Git 1
.
7
.
4
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
J
u
nio
C
Hamano
M
e
rge branch 'as/userdi
f
f
-pascal'
commit
|
commitdiff
|
tree
2011-01-24
Junio C H
a
m
ano
Merge bra
n
ch 'jn/s
e
t
u
p-
f
i
x
es'
commit
|
commitdiff
|
tree
2011-01-24
Jonathan Nieder
t1510: fix typ
o
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 H
a
mano
Documentation
updates for 'GIT_WORK_TREE w
i
thout
GI
T
_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan N
i
eder
Subje
c
t:
s
etup: offi
c
ially support --work-tree witho
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nieder
Documentation: do not
treat reset --ke
e
p as a special
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
Bjö
r
n
Stein
b
r
i
nk
Correctl
y
report
corrupte
d
obj
e
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan
Nieder
tests:
c
ompress th
e
set
u
p tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Ni
e
der
tests: cosm
e
tic
im
p
rovements to
the repo-setup
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ham
a
no
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-01-19
E
r
ik
F
aye-Lund
exec_c
m
d: remove
u
nused extern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch 'jn/gi
t
web-n
o
-logo' into
maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch 'jk/dif
f
-dri
v
er-binary-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ham
a
no
Me
r
ge branc
h
't
r
/
s
ub
m
od
u
le-relat
i
ve-scp-u
r
l' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ha
m
ano
Mer
g
e
br
a
nc
h
'rj/maint-
d
ifftool-cygwin-wor
k
around'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
amano
M
erge b
r
anch 'rj
/
m
a
i
nt-test-fixes' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C Hamano
Merge b
r
an
c
h 'jn/
m
aint-gitweb-pathinfo-fix' into maint
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C
Hamano
Merge branc
h
'ak/describe-
e
x
a
ct' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch 'jn
/
maint-fast-import-
o
bject-reuse'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
J
u
n
i
o
C
Hamano
Merge
br
a
nch 'jn/submod
u
le-
b
-
curre
n
t
' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Haman
o
Merge
b
ranch 'jc/maint-svn-info-t
e
st-
f
i
x'
i
nto maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C H
a
mano
Merge branch
'nd/maint-r
e
lative' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Jonatha
n
Nieder
Documentatio
n
/fas
t
-import: p
u
t
e
xplan
a
tion of M 040000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ramsa
y
Jo
n
es
s
v
n
d
ump
.
c: Fix a p
r
intf format compiler war
n
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Niede
r
remote-ext:
d
o not segf
a
ult for bl
a
nk l
i
nes
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nieder
Documentati
o
n/fast-
i
mpor
t
:
capitalize b
e
ginning of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Juni
o
C
Hamano
t
4
0
34 (diff --
w
ord-d
i
ff): ad
d
a minimum Perl dri
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next