repo.or.cz
/
git
/
gitster.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 Zweigber
g
k
rebase -m: don't p
r
int
e
x
i
t code 2 when m
e
rge
fail
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
reb
a
se -m: rememb
e
r al
l
ow_rerer
e
_
a
uto
u
pdate
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
o
n
Zw
e
i
gbergk
re
b
a
s
e: reme
m
b
e
r
strategy an
d
strategy options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e: remember ve
r
bose option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweig
b
ergk
rebase: extract co
d
e for writing basic
s
t
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: f
a
ctor out sub
c
ommand h
a
ndling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase
:
make
-v a t
i
ny b
i
t more verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigberg
k
rebase -i: align va
r
iable na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
reba
s
e
: s
h
ow con
s
i
stent conflic
t
re
s
o
l
ution hint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract am co
d
e to
new source
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
igbe
r
gk
r
ebase: extract merge code to n
e
w
source f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: remove
$branch as synon
y
m for $ori
g
_head
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von Zweigbergk
rebase -i:
s
uppor
t
--stat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
re
b
ase:
f
actor ou
t
call to pre-rebase hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigber
g
k
rebase: factor out clean work tree check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: fac
t
or out
reference
p
a
r
sing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
w
eigbe
r
gk
reba
s
e: r
e
o
r
der v
a
lid
a
tion steps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Zweigbergk
rebase -i:
re
m
ove no
w
unnec
e
ssary
directory checks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweigbergk
reba
s
e
:
facto
r
out command l
i
ne option proce
s
s
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: align variable content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
r
ebas
e
: align variable names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: st
r
i
cter c
h
eck
of sta
n
dalone s
u
b command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweig
b
erg
k
reba
s
e
:
act on comma
n
d line outside parsing loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
re
b
ase: improv
e
detection of rebase in p
r
og
r
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
o
n Zweigbergk
r
ebase: r
e
move unused rebase
s
tate 'prev
_
head'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
erg
k
re
b
ase: read st
a
te outside loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
refac
t
or reading of state
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwei
g
bergk
rebas
e
: clea
r
er na
m
es for dir
e
ctory
variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Hamano
Merge branch 'tr/merge-
u
nbo
r
n-clobber'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge
bra
n
ch
'
jc
/
unpack-trees'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io C Ham
a
no
M
e
r
ge branc
h
'
j
c/f
s
ck-fix
e
s'
commit
|
commitdiff
|
tree
2011-02-10
J
u
ni
o
C H
a
mano
M
erge branc
h
'tr/d
i
ff-words-
t
est'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ha
m
ano
Merge branch
'rr/f
i
-import-mark
s
-if-exi
s
ts'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hama
n
o
Merge branch 'jn/unpack-ls
t
at
-
fai
l
ure-report'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge b
r
anch 'ef/alias
-
via-run-co
m
mand
'
commit
|
commitdiff
|
tree
2011-02-10
J
u
ni
o
C Haman
o
M
e
rge branch 'cb/setu
p
'
commit
|
commitdiff
|
tree
2011-02-10
J
unio C Hamano
Merge branch 'ae
/
better-t
e
mplate-failure-report'
commit
|
commitdiff
|
tree
2011-02-10
J
unio C Hamano
Merge branch
'jn/cher
r
y-pick-strategy-option'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
erge br
a
nch 'maint-1
.
7
.
0' into mai
n
t
commit
|
commitdiff
|
tree
2011-02-10
Jo
n
athan Nied
e
r
fast-import
:
int
r
o
d
uce "feature notes" com
m
a
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nieder
fas
t
-import
:
cla
r
ify documentation of "feature" comm
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 Kleine-König
Documentation/merge subtree How-To: fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jen
s
Lehmann
pull: Document
t
he "--[no-]recurse-submodul
e
s" options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nie
d
er
quote
.
h
:
s
i
m
plify the inclusion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thá
i
N
g
ọc Duy
s
ha1_object_inf
o
: examine cach
e
d_ob
j
ect store too
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
sha1_file
.
c
: m
o
ve find_
c
ached_object up so sha1_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,tag}_buffer()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn
T
há
i
Ngọc
D
u
y
d
i
f
f
: sup
p
ort --cach
e
d
o
n 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
akub N
a
r
e
b
s
k
i
g
i
tweb:
Mention optiona
l
Perl modules in IN
S
TALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Si
t
aram Chamarty
pos
t
-receive-ema
i
l:
suppress
error if descr
i
p
tion fil
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t7407: fix line ending
s
for mingw b
u
ild
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Joha
n
nes
S
i
xt
t
4120-
a
p
p
ly-p
o
pt: help systems with core
.
f
ilemo
d
e
=
fa
l
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Th
o
yts
t3509:
u
se unco
n
strained i
n
itial test
t
o setup repos
i
tory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Joh
a
nnes Sixt
start_command
:
flu
s
h buffer
s
in
t
he WIN32 code
path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
S
ha
w
n O
.
Pearc
e
b
u
nd
l
e: Use OFS_
D
ELTA in bundle files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
J
unio C Hamano
Merg
e
b
r
an
c
h 'jl/fetch-
s
u
bmodule
-
recursive' in
t
o
maint
commit
|
commitdiff
|
tree
2011-01-31
J
e
n
s Lehm
a
nn
t5526: Fix wrong argument
o
rder i
n
"gi
t
co
n
fig"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C H
a
man
o
Git 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C
H
amano
fsck: do not give up too e
a
rly in fs
c
k_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C
Hamano
fsck: drop unused para
m
e
ter
f
r
o
m
travers
e
_one_o
b
j
e
ct()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Ada
m
T
k
ac
Don'
t
p
a
s
s "--xhtm
l
" to hi
g
htlight in g
i
tweb
.
perl sc
r
ipt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
u
nio
C
Ham
a
no
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-01-27
J
o
nathan Nieder
re
b
ase -i:
c
larify in-editor documentat
i
on of "exec"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
eff King
tests: sanitize more gi
t
envir
o
nment variab
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hama
n
o
Merge bran
c
h 'jn/fast-i
m
port
-
empty-tree-re
m
oval' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Nie
d
er
fast-import: t
r
eat
f
i
l
e
m
o
dify with empt
y
tree
as del
e
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
r
e
b
a
se:
g
i
v
e a bette
r
error message for bog
u
s branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
re
b
a
s
e: use explicit "--" with checkout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Juni
o
C Ha
m
ano
Git 1
.
7
.
4-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
M
erg
e
branch 'a
s
/userdiff-pascal
'
commit
|
commitdiff
|
tree
2011-01-24
J
u
nio C Hamano
Merge br
a
n
ch 'jn/setup-fixes'
commit
|
commitdiff
|
tree
2011-01-24
Jonath
a
n
Nieder
t1510: fix typo i
n
the co
m
ment of a test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Ju
n
i
o
C
Ham
a
n
o
D
o
cumenta
t
ion upd
a
tes f
o
r 'GIT_WO
R
K
_
TREE
w
i
thout G
I
T_D
I
R
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nieder
Subj
e
ct:
setup: official
l
y support
--work-
t
ree without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jona
t
han Nieder
Documentatio
n
:
d
o
not
treat reset
-
-keep
as a special
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
B
jörn Steinbrink
Cor
r
e
c
tl
y
report corrupted objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nied
e
r
tes
t
s
:
c
o
mpress t
h
e
s
etu
p
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Ni
e
der
tests:
c
o
smetic im
p
r
ov
e
ments to the repo-setup test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
unio
C
Hamano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-01-19
Erik Faye-Lu
n
d
e
xec_c
m
d: re
m
ove
u
nused e
x
t
e
rn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
erge branch 'jn/gitweb-no
-
logo'
into
maint
commit
|
commitdiff
|
tree
2011-01-19
J
unio C
H
amano
Merge
b
r
a
nc
h
'jk/diff-d
r
iver-binary-doc' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
a
m
a
n
o
M
e
rge branch '
t
r
/submodule-re
l
a
t
iv
e
-s
c
p-url' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
un
i
o C Ha
m
a
no
Merg
e
bran
c
h 'rj/mai
n
t-difftool-cygwi
n
-workaroun
d
'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C
Hamano
M
e
rge branch 'r
j
/m
a
int-test
-
f
ixes'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge br
a
n
c
h '
j
n/mai
n
t
-
gitweb-p
a
t
hinfo-
f
i
x
' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branc
h
'ak/
d
e
scribe-exact
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
aman
o
Merge branch 'jn/maint-f
a
st
-
i
mport-object-r
e
use' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hamano
Merge branch 'jn/submo
d
u
le-
b
-cu
r
rent'
into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hama
n
o
Merge branch '
j
c/maint-svn-in
f
o-
t
est
-
fix' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge
b
ranch 'nd/maint-relat
i
ve' into m
a
int
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
Documentation
/
fast-import
:
put explanat
i
on of M 040000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay J
o
nes
sv
n
dump
.
c: Fix
a
print
f
format com
p
iler warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan N
i
eder
remote-ext:
d
o not segfault for blan
k
lin
e
s
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jo
n
athan Nie
d
er
Docu
m
entation/f
a
st-import: capit
a
lize
b
eginning
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
J
u
nio
C
Hamano
t4034 (diff --word-diff)
:
add a min
i
mum Perl dri
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
J
onathan Nie
d
er
t4034 (diff
-
-word-diff): style suggestio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nied
e
r
userdiff: simplify word-d
i
f
f
safeguard
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
T
h
omas Rast
t4
0
34: bulk verify built
i
n word r
e
gex sanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
R
a
mk
u
mar Ramachandra
fast-imp
o
rt: Introduce --im
p
o
r
t
-
ma
r
ks-if-exist
s
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next