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 von Zwei
g
b
e
rgk
reba
s
e: use
@
{upstrea
m
} if no upstream spe
c
ified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwei
g
bergk
rebas
e
-i
:
r
e
move unnecess
a
ry stat
e
rebase-
r
oot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
reb
a
se -
i
: don'
t
read unused vari
a
b
l
e p
r
eserve_merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
i
g
bergk
g
it-
r
ebase--am: r
e
m
ove unnecess
a
ry --3wa
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
v
on
Z
weigber
g
k
rebase -m: don
'
t
print e
x
it code 2 when merge fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigb
e
r
gk
re
b
ase -m:
re
m
ember
allow_
r
e
r
ere_autoupdate opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigberg
k
rebas
e
: remember strategy
and
s
tr
a
tegy options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
re
b
as
e
: rem
e
mber verb
o
se option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase: extract code for writing basic state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zw
e
igbergk
rebase: factor out sub command handling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigb
e
rgk
rebase: make -v a tiny bit mor
e
verbose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebas
e
-i: align variable na
m
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Z
w
eigberg
k
rebase: show consistent conflict reso
l
ution
hint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigberg
k
rebase: extract
am code to new source fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
i
n
von Zw
e
i
g
be
r
gk
r
ebase: extract merge
c
o
d
e to n
e
w source file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
reb
a
se:
r
e
move $bran
c
h as syno
n
y
m for
$or
i
g_h
e
ad
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
re
b
ase -i: support --
s
tat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igber
g
k
rebase:
f
actor out c
a
ll t
o
pre-rebase hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
r
ebase
:
facto
r
ou
t
clean work
t
ree
c
heck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
igbergk
rebase: factor o
u
t referenc
e
p
a
rsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwe
i
gb
e
rgk
reb
a
se: reorder validation
s
t
e
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
re
b
ase -i: remo
v
e now un
n
e
cessary director
y
checks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igberg
k
reba
s
e
: fac
t
or out comm
a
nd line
o
ption processing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e:
a
l
ign variable content
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Zw
e
i
g
bergk
rebase: align va
r
i
able names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
von Zweigb
e
rgk
rebase: st
r
ic
t
er
check
of
s
tan
d
a
l
o
n
e sub command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
s
e
: ac
t
on comm
a
n
d line ou
t
side parsing
l
o
op
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
r
e
b
a
se: im
p
rove detec
t
ion of rebas
e
in
progress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n vo
n
Zweigbergk
rebase:
remov
e
u
n
u
s
ed rebase s
t
ate 'pr
e
v_head'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n v
o
n Zwe
i
gbe
r
gk
rebase: read state outside loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: refactor readin
g
of st
a
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
M
a
r
t
in
von Zweigberg
k
reb
a
s
e
:
c
learer names for
d
irectory variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
Merge branch 'tr/merge-un
b
orn
-
clobber'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
Merge
branch 'jc/u
n
pack-
t
rees'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
M
e
r
g
e
b
r
a
n
ch 'jc/fsck-f
i
xes'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Mer
g
e bra
n
ch 'tr/diff-wor
d
s
-
test'
commit
|
commitdiff
|
tree
2011-02-10
J
unio C Hamano
Merge branch 'rr
/
f
i
-
import-m
a
rks-if-exists'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hama
n
o
Merge br
a
n
c
h 'jn/unpack-lstat-
f
ailure
-
rep
o
rt
'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Ha
m
ano
M
e
r
ge
branch 'ef
/
alias-
v
ia-run-command'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Hama
n
o
Merge branch 'cb/setup'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io C Ham
a
no
Mer
g
e branc
h
'ae/better-te
m
plate-failure-rep
o
rt'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hamano
M
erge branch 'jn/
c
herry-pick-strategy
-
option'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hama
n
o
Merge branch
'
maint-1
.
7
.
0'
into
m
a
int
commit
|
commitdiff
|
tree
2011-02-10
Jona
t
han
Nieder
fast-i
m
p
o
rt: int
r
oduc
e
"
feature notes" com
m
and
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan
N
ieder
fast-import: clarify docu
m
en
t
ation of "feat
u
r
e"
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
Kl
e
i
ne-Köni
g
D
o
cumentation/merge subtree How-To: fix
typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jens Le
h
man
n
pull: Document the "--[no
-
]recurs
e
-su
b
modules" option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nieder
quot
e
.
h
:
si
m
plif
y
the
inclusi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ng
ọ
c Duy
s
ha1_object_info:
ex
a
mine 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
sha
1
_f
i
le
.
c: move
f
i
nd_c
a
ched_object
u
p so
sha1_o
b
j
e
ct_info
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Ng
u
y
ễ
n
T
h
ái
N
gọc Duy
A
dd c
o
nst to
parse_{commit
,
tag}_buffer()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguy
ễ
n Thái Ngọc D
u
y
d
i
ff
:
support --cached on unborn 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
Jakub Narebski
gitweb
:
Mention optional Perl mod
u
les in
I
NSTALL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Sitar
a
m Chamarty
post-
r
ecei
v
e-em
a
il: suppress error if de
s
cr
i
pti
o
n f
i
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t7407:
fix line endings for mingw build
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Joha
n
n
e
s
Sixt
t4120-apply-popt: help
systems w
i
th core
.
filem
o
de=f
a
lse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat
T
ho
y
ts
t3509: u
s
e uncon
s
t
r
ained initial test
t
o setup
r
epository
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Sixt
start_command: flus
h
buffers i
n
th
e
WI
N
32 co
d
e path
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
S
h
awn O
.
P
earce
bundl
e
: Use OFS_D
E
L
TA in bundl
e
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Hamano
Merge branch
'jl/f
e
tch-
s
ubmodule
-
recurs
i
ve' into maint
commit
|
commitdiff
|
tree
2011-01-31
J
e
ns Leh
m
ann
t552
6
:
F
i
x
w
r
o
ng a
r
gume
n
t order i
n
"
g
it config"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
Jun
i
o C Hamano
Git 1
.
7
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
J
unio
C Hamano
fsck: do
not give u
p
t
o
o
ear
l
y in fsc
k
_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
fsck: drop unus
e
d pa
r
ameter from
t
raverse_o
n
e_object()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tkac
Don't pass "-
-
xh
t
ml" to hightlight in gitweb
.
perl script
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Ju
n
io
C Hamano
M
e
rge bra
n
ch
'
m
aint
'
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Nieder
rebase -i:
c
larify in-ed
i
to
r
doc
u
mentation of
"exec"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
tests
:
sani
t
ize mor
e
g
it environment va
r
iable
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
J
unio C Hamano
Merge b
r
an
c
h 'jn/fast
-
import-e
m
pty-tree-r
e
moval
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonatha
n
N
i
e
der
f
ast-import:
t
reat fil
e
modify with empty tre
e
as delete
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jef
f
Ki
n
g
rebase: give a
b
etter error message for bo
g
us branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Jeff
K
in
g
reb
a
se: use ex
p
lic
i
t "--"
with
c
h
ecko
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Ju
n
io C
Hamano
Git
1
.
7
.
4-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Haman
o
Merg
e
bran
c
h
'
as/u
s
erdiff-pascal'
commit
|
commitdiff
|
tree
2011-01-24
Junio C Haman
o
M
erge branch 'jn
/
setu
p
-fixe
s
'
commit
|
commitdiff
|
tree
2011-01-24
Jonathan Nieder
t1510:
f
ix typo in
the comment
of a tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Jun
i
o
C Ham
a
no
Documentation u
p
da
t
e
s for 'GIT_WORK_TREE without GIT_
D
IR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
J
o
n
athan Nied
e
r
S
ubject: setup: offic
i
ally
s
u
pport
-
-
w
ork-tree without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
J
o
na
t
han Ni
e
der
D
o
cumentation: do n
o
t
t
r
eat
r
es
e
t
--keep as a
s
pecial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-20
Björn Steinbri
n
k
C
orrectly r
e
port cor
r
upt
e
d objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
tests: com
p
res
s
the setup tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
tes
t
s: cosme
t
ic improvements to the r
e
po-setup test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-01-19
E
r
i
k Faye-L
u
n
d
exec_c
m
d: remove unused
extern
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
e
r
ge branch
'jn/gitweb-no-log
o
' int
o
maint
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C Hamano
Merge bran
c
h '
j
k/di
f
f-
d
river-binary-doc'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio
C
Hamano
Merge branch '
t
r/submodule-relati
v
e
-
scp-url'
i
nto maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge bra
n
ch 'rj/mai
n
t-difftool-cygwi
n
-workaround'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio
C Hama
n
o
M
erge branch 'rj
/
maint-te
s
t-
f
i
x
es' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge bran
c
h '
j
n/m
a
int-gitweb
-
pathinfo-fix'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C H
a
mano
Merge branch '
a
k/de
s
cribe-exac
t
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Junio C H
a
m
a
no
Merge
branch 'jn/maint-fast-import-object-reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branc
h
'jn/s
u
bmodule-b-curr
e
nt' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C Hamano
Merge branch 'jc
/
maint-svn
-
in
f
o-test-fi
x
' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
a
mano
M
e
rge branch 'nd/main
t
-relative' into mai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Jonathan
N
i
e
der
Documentation/fast-import: put ex
p
lanation of M
0
40000
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay Jones
svndump
.
c: Fix a printf format com
p
ile
r
w
a
rning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jona
t
ha
n
N
i
e
der
remote-ext: do no
t
seg
f
ault for
b
lank lines
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan
N
ieder
Documen
t
a
tion/fast-impor
t
: capitalize begin
n
ing of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jun
i
o C Hamano
t4034 (diff --
w
ord-d
i
ff): ad
d
a
minim
u
m
P
erl dr
i
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next