repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase -m: don't print exit code 2 when merge fails
2011-02-10
Martin von
Z
weigb
e
rgk
rebase -m
:
don't pri
n
t exit
c
o
d
e
2
w
hen mer
g
e fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase -m:
r
emember al
l
o
w_rere
r
e
_
autoupdate
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigber
g
k
re
b
ase: remember
strate
g
y a
n
d strategy
op
t
io
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: reme
m
ber
v
erbose o
p
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von Zweig
b
ergk
rebase: extra
c
t code for
w
riting bas
i
c s
t
ate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigb
e
r
g
k
r
e
base: f
a
ctor o
u
t sub comman
d
handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
:
make -v a ti
n
y bit more ver
b
ose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
be
r
g
k
re
b
ase -i:
align variable names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
weigbergk
reb
a
se: show
consisten
t
conflict resolution hint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwei
g
bergk
rebase:
extract am code
t
o new source file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: extract merg
e
code to ne
w
source fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zw
e
ig
b
e
r
gk
reb
a
se: r
e
m
o
ve
$
b
ranch as
s
y
n
ony
m
for $orig_hea
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Zweigbergk
rebase -i: sup
p
o
rt --stat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigb
e
rgk
rebase
:
factor
o
ut call to pre-
r
e
b
a
se ho
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase: facto
r
out
clean work
tre
e
che
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: fac
t
or out refere
n
ce parsi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
re
b
ase: reorder
v
alidation step
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase -i: re
m
ove now unnecessary directory ch
e
cks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Zweigbergk
rebase
:
factor out command line optio
n
processing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigber
g
k
rebase: ali
g
n varia
b
le content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eig
b
ergk
r
e
base: align variable n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigb
e
rgk
rebase: stricter check of standalone sub com
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Z
w
eigb
e
r
gk
rebase: act on command
line outside
p
arsing lo
o
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
b
ase: impro
v
e detectio
n
of rebase in progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbe
r
g
k
r
e
ba
s
e: r
e
move unused rebase state 'p
r
ev_he
a
d'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbe
r
gk
rebas
e
: rea
d
sta
t
e
o
ut
s
ide loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
reb
a
se: refact
o
r r
e
ading 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
Martin von Zwe
i
gbergk
rebase: clear
e
r name
s
f
o
r
d
i
r
e
c
tor
y
variabl
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hamano
Merge
branch
'tr
/
merge-unborn-clobber'
commit
|
commitdiff
|
tree
2011-02-10
Junio C H
a
mano
M
erge branc
h
'j
c
/unpack-trees'
commit
|
commitdiff
|
tree
2011-02-10
J
u
n
i
o C H
a
m
a
no
Merge
b
ra
n
ch
'
jc/fsc
k
-
fixes'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'tr
/
d
iff-wo
r
ds-test'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
erge bra
n
c
h
'
r
r
/
fi-
i
mport-mark
s
-if-
e
xi
s
ts'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ha
m
a
no
Merge branch 'jn/unpack
-
lstat
-
fail
u
r
e
-
r
e
port
'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Hamano
M
e
r
g
e
branch
'
e
f/alias-via-
r
u
n-
c
ommand'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hamano
Merge br
a
n
ch 'cb/setup'
commit
|
commitdiff
|
tree
2011-02-10
J
unio C Hamano
M
e
rg
e
branch 'ae/better-t
e
mplat
e
-
failure-
r
ep
o
rt'
commit
|
commitdiff
|
tree
2011-02-10
Junio C
H
a
m
ano
M
e
r
ge bra
n
ch 'jn/
c
h
e
rry-p
i
ck
-
strategy-option'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'maint-1
.
7
.
0
' int
o
maint
commit
|
commitdiff
|
tree
2011-02-10
Jonathan
Ni
e
der
fast-import: intro
d
uce "feature notes" co
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan
N
ieder
fa
s
t-import: clarify d
o
cume
n
tatio
n
of "feature" 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
U
w
e
Kleine-König
Document
a
ti
o
n
/
m
erge
s
ubtree
How-To: fix t
y
po
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jens Lehmann
pu
l
l:
D
o
cu
m
ent the "
-
-[no-]rec
u
rse-submodules" options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jo
n
athan Nieder
quote
.
h:
simplify
t
he 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 cach
e
d_
o
bject
s
t
ore too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễ
n
Thái Ngọc Duy
sha1_
f
ile
.
c
: move find_cached_
o
bject
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
N
guyễn Thái
Ngọc Duy
A
d
d const t
o
parse_{commi
t
,tag
}
_
b
u
ff
e
r
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ngọc Duy
di
f
f: support
--cac
h
ed 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
J
a
k
ub Narebski
gitweb: Menti
o
n o
p
tional
Perl m
o
dules in
I
NSTAL
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sit
a
ram Chamarty
post-receive-email: suppress error if desc
r
iption file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Th
o
yts
t
7407: fix lin
e
end
i
ng
s
f
or ming
w
build
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johanne
s
Sixt
t4120-apply-popt: help sys
t
ems wi
t
h c
o
re
.
filemode=fal
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat
T
hoyts
t35
0
9: use
u
nc
o
nst
r
a
ined initial
te
s
t
t
o
setup repository
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
J
oh
a
nnes
S
ixt
start_c
o
m
mand: flush buffers in the
W
IN32 code path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Shawn O
.
Pearce
bundl
e
:
U
s
e OFS_DELTA in bundle
f
il
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Haman
o
Merg
e
bra
n
ch 'j
l
/fetch-subm
o
dule-recursi
v
e'
i
nto maint
commit
|
commitdiff
|
tree
2011-01-31
Je
n
s
Lehmann
t5526
:
Fix wrong argument order in "git con
f
ig"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
J
uni
o
C
Hamano
G
it 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
fsc
k
: do not give
u
p
too ea
r
ly in fsc
k
_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
nio C Hamano
fsck: d
r
op
u
nused parameter from traverse_one_objec
t
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
A
dam
T
kac
Don't
p
ass "--xhtml"
t
o hightlight in gitweb
.
perl s
c
ript
.
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-edi
t
or documentat
i
o
n
of "exe
c
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff K
i
ng
tests: sanitize mor
e
git environment variabl
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Haman
o
M
erge b
r
anch 'jn/fast-impo
r
t-empty-tree-
r
emoval' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jo
n
a
than Nieder
f
a
st-i
m
port: treat filemodi
f
y w
i
t
h
empty tree as delete
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
e
f
f King
reba
s
e: give a bet
t
er
e
rror message fo
r
b
ogus branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: u
s
e explicit "--" with che
c
k
o
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
G
i
t 1
.
7
.
4-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Ju
n
io C Hamano
Merge branch 'as/userdiff-pascal
'
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hama
n
o
Merg
e
branch 'jn/se
t
u
p
-fixes'
commit
|
commitdiff
|
tree
2011-01-24
Jonathan
N
iede
r
t151
0
:
fix
t
ypo in the comment of a test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Jun
i
o C H
a
mano
Docu
m
en
t
a
t
ion updates for 'GIT_
W
ORK_TREE without GIT_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
J
ona
t
han Nieder
S
u
bj
e
ct: setup: officially
s
u
pport --work-tree w
i
thout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan
Nieder
Documentat
i
on: do not treat reset --keep as
a
speci
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
Björn Steinb
r
ink
Correctly report corrupte
d
obje
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
te
s
ts: compress the setu
p
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jo
n
a
t
han Nieder
tes
t
s
: cosm
e
tic improvements to t
h
e
r
ep
o
-setup test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio
C
Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2011-01-19
Erik Faye-
L
und
exec_cmd
:
remove unused ex
t
ern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hamano
Merge branch 'jn/gitweb-no-l
o
go
'
into m
a
int
commit
|
commitdiff
|
tree
2011-01-19
Junio C Haman
o
Me
r
ge b
r
anch 'jk/d
i
f
f
-dri
v
er-binary-
d
oc' into
maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge br
a
nch 'tr/subm
o
dule-r
e
l
a
ti
v
e
-
scp-url' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hamano
Mer
g
e
b
ran
c
h '
r
j
/m
a
int-di
f
fto
o
l
-cy
g
win-workaround'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
i
o C Hamano
M
erge branch
'
rj/maint-
t
est-fixes' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merg
e
branch 'jn/maint-git
w
e
b-pat
h
info-fix'
into main
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Haman
o
Merg
e
b
r
a
n
c
h 'a
k
/describe-exac
t
' into main
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Mer
g
e branch 'jn/maint-fast-imp
o
rt-object-reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio
C Hamano
Merge branch 'j
n
/submo
d
ule-b-cu
r
r
en
t
' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Haman
o
M
e
rge branch 'jc/maint
-
s
vn-info-test-fix
'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o
C Ha
m
ano
Merge bran
c
h 'n
d
/m
a
int-re
l
ative'
into
maint
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Ni
e
d
er
Docu
m
entation/fast-impo
r
t: put explanation of M 040000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay Jon
e
s
svndump
.
c:
F
i
x a prin
t
f format compiler warnin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonat
h
an Nieder
rem
o
te-e
x
t: do
n
ot segfau
l
t for
b
lank 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
Documentation/fast-import:
capitalize b
e
ginni
n
g of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Junio C Hamano
t
403
4
(diff --
w
ord-di
f
f): add a minimum Pe
r
l drier
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonatha
n
Nieder
t4034 (
d
i
f
f --word-dif
f
): style
s
uggestion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jona
t
han Nieder
userdiff: simpli
f
y
word-diff
safeguar
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Th
o
mas Rast
t
4
034:
b
ulk verify bui
l
t
i
n word r
e
g
e
x sanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
R
amkumar Ramachandra
f
a
st-im
p
ort: Introduce -
-
import-marks-if-exists
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next