repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase: remember strategy and strategy options
2011-02-10
Martin von
Zweigb
e
rgk
rebase: r
e
member strategy and strategy options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
b
ase:
r
ememb
e
r
verbose option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: ex
t
ract code for writin
g
bas
i
c st
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base:
f
actor out s
u
b command han
d
l
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
m
ake
-v a ti
n
y bit mor
e
verbose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
r
e
b
a
s
e -
i
: a
l
ign variabl
e
names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gb
e
r
g
k
rebase:
show consistent conflict resolution
hint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: extract am code to new
so
u
rce
f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zw
e
i
gbergk
rebase: extract mer
g
e cod
e
to new
s
our
c
e
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Zw
e
igberg
k
rebas
e
: r
e
m
ove $branch as sy
n
o
nym for
$
orig_he
a
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase -i: suppor
t
--stat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweigbergk
rebase
:
fac
t
or out c
a
ll to
p
re-rebas
e
h
ook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase: factor
o
u
t
clean 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
rgk
rebase: fa
c
tor out referenc
e
pars
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
ergk
rebase: reorde
r
validat
i
on
steps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwei
g
bergk
rebase -i:
r
emove now unnecessary direct
o
ry c
h
e
c
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase: factor
out c
o
mmand li
n
e op
t
ion processing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von
Zweigbergk
rebas
e
: align varia
b
le conten
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Z
w
eigbe
r
gk
rebase: ali
g
n va
r
iable names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von Zweigbergk
r
ebase: st
r
icter chec
k
o
f standa
l
o
n
e sub comma
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: act
o
n com
m
and l
i
ne outside parsing loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
vo
n
Z
weigbe
r
gk
re
b
ase: i
m
prov
e
d
etection
of rebase
i
n progress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e: rem
o
ve unused rebase
s
tate 'prev_hea
d
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weig
b
e
rgk
rebase:
read
state o
u
tside loop
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweigbergk
rebas
e
: refa
c
tor r
e
adin
g
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
Martin von Zwe
i
gber
g
k
re
b
ase: cleare
r
n
ame
s
f
or directory varia
b
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
i
o
C
Ha
m
ano
Merge b
r
an
c
h
'
tr/
m
erge-unborn-cl
o
bber'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Mer
g
e branc
h
'jc/un
p
ack-trees'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io
C
H
a
mano
Merge br
a
nch 'jc/fsck-
f
i
x
es'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Haman
o
Merge branch 't
r
/
d
iff-
w
ords
-
te
s
t'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io C
Hamano
Merge branch '
r
r
/
fi-import-marks-i
f
-exists'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hamano
Merge branch '
j
n/unpa
c
k
-lstat-failure-re
p
o
r
t'
commit
|
commitdiff
|
tree
2011-02-10
J
unio C Haman
o
Merge branch 'ef/alias-
v
i
a
-run-command'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Hamano
Merge branch 'cb/set
u
p'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'a
e
/bet
t
er-template-failure
-
report'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o
C
Hama
n
o
Me
r
ge branch 'jn/che
r
ry-
p
ick-strate
g
y-op
t
i
o
n'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge br
a
nch 'ma
i
nt-1
.
7
.
0
' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2011-02-10
Jonathan
N
ieder
fast-imp
o
rt: introduce "feature notes"
c
ommand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan N
i
e
d
er
fa
s
t-impo
r
t
: clarify documentation o
f
"feature"
c
ommand
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öni
g
Documentation/merge subtree How
-
T
o:
fix t
y
po
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jen
s
Lehmann
pull: Document
t
he
"-
-
[
no-]re
c
urse
-
submodules"
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nieder
quote
.
h:
simplify
the inclu
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái
Ngọc Du
y
sha1_object_info: exa
m
ine
c
ac
h
ed_object
store too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Ngu
y
ễ
n
Thái Ng
ọ
c Duy
sha1_file
.
c: mo
v
e f
i
nd_cached_object up so sha1_object_info
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguy
ễ
n Thái Ngọc Duy
Add co
n
st t
o
parse_{c
o
mmit,tag}_buffer(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ngọc Duy
diff
:
support -
-
cached
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
Jakub
N
a
rebski
gitweb:
Me
n
tion opt
i
o
n
a
l Perl modules in I
N
S
TALL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Sitaram Chamarty
post
-
receive-e
m
ail
:
suppress error if desc
r
i
p
t
ion file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t7407: fix
line endings for mingw bui
l
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Johannes S
i
xt
t412
0
-apply-popt:
h
elp sy
s
te
m
s wit
h
c
o
r
e
.
filem
o
de=false
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
P
at
T
hoyt
s
t35
0
9: use uncon
s
trained initia
l
test to set
u
p
rep
o
sitory
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
J
o
hannes Sixt
start_co
m
m
and: flush
b
uff
e
rs
i
n
t
he WIN32 code p
a
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-02-07
Shawn O
.
P
earce
bundle: Use O
F
S
_DELTA in bundle
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Hamano
Me
r
g
e
branch 'jl/
f
etch-submodule-recursive' into maint
commit
|
commitdiff
|
tree
2011-01-31
Jens Lehm
a
nn
t5526: Fix
w
r
on
g
argum
e
nt
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
Ju
n
io C Hamano
fsck: d
o
not
give up
t
o
o early in fs
c
k_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
fs
c
k: d
r
op unuse
d
parameter from t
r
avers
e
_one_o
b
ject()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tka
c
Don't p
a
ss "--xhtml" to hightlight in gitweb
.
pe
r
l script
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Juni
o
C Hamano
Me
r
ge branch '
m
a
int'
commit
|
commitdiff
|
tree
2011-01-27
J
onat
h
an Nieder
rebas
e
-i: clarify in-editor
docum
e
ntati
o
n of "exec"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
J
e
ff King
tests: sanitize more g
i
t
e
nvironment variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Junio C
H
a
m
ano
Merge branch 'jn/fast-imp
o
rt-
e
mpty-tree-removal'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonatha
n
Ni
e
der
fast-impo
r
t: treat fi
l
emodify wit
h
empty tree as delete
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f
K
i
ng
rebase:
give a better
e
rror messa
g
e for bogus
b
r
anch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f King
re
b
ase: us
e
e
x
pl
i
cit "--" with ch
e
ckout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Git 1
.
7
.
4-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio
C
H
a
mano
M
e
rge
branch
'a
s
/userdiff
-
p
ascal'
commit
|
commitdiff
|
tree
2011-01-24
Junio C Ham
a
no
Merge
b
ranch '
j
n/s
e
tup-fixe
s
'
commit
|
commitdiff
|
tree
2011-01-24
Jonat
h
an
N
ieder
t151
0
:
f
i
x
t
ypo in
t
he comment of a test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hama
n
o
Documentation
up
d
ates fo
r
'
GIT_WOR
K
_TREE witho
u
t GIT_DIR
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nieder
Subjec
t
: setup: officia
l
ly support --
w
ork-tree without
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nie
d
er
Docume
n
tation: do not treat re
s
et --keep
as a specia
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-20
Bjö
r
n
St
e
i
n
brink
Correctly report corrup
t
ed objec
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
J
onathan Nieder
te
s
t
s
: co
m
press the
setup tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
te
s
ts:
c
osm
e
tic
improv
e
ments t
o
the repo-setup test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-01-19
Erik
F
aye-Lund
exec_cmd: r
e
mov
e
unuse
d
ext
e
r
n
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
Jun
i
o C H
a
mano
Merge bra
n
ch 'jk/d
i
ff-driver-bina
r
y
-do
c
' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
amano
M
erge
b
ranch 'tr/subm
o
d
u
le-relat
i
ve-scp-url
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C
Hamano
Merge
branc
h
'rj/maint-difftool
-
c
ygwin-w
o
rkaround'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Hamano
Mer
g
e branch 'r
j
/main
t
-test-fix
e
s'
into
m
aint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C Hamano
M
e
rge bra
n
ch 'jn
/
m
aint-gitweb-p
a
t
h
info-fi
x
' into maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C
H
a
m
ano
Merge branch
'
a
k
/de
s
cr
i
be-exact' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C Hamano
Merge branch 'jn/maint-
f
as
t
-
i
mp
o
rt-o
b
ject
-
r
e
use' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Hamano
Merge b
r
anch '
j
n/subm
o
dule-b-current' in
t
o main
t
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C Hamano
Me
r
ge br
a
n
c
h 'jc/
m
a
i
n
t
-svn-i
n
fo-test-f
i
x' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Haman
o
Merge branch
'
nd/
m
ai
n
t-relati
v
e' into
m
aint
commit
|
commitdiff
|
tree
2011-01-19
J
on
a
tha
n
Nieder
Documentation/fast-
i
m
p
ort: put explanation of M 040000
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-19
R
amsay
J
ones
svndump
.
c: Fix a printf format co
m
piler w
a
rning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jonat
h
an Nie
d
er
remot
e
-
e
xt:
d
o not
s
egfault for blank lines
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jon
a
than
N
ieder
D
o
cumen
t
ation/fa
s
t-import:
c
apitalize begi
n
ni
n
g o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Junio C Haman
o
t4
0
34
(d
i
ff -
-
wo
r
d
-
dif
f
): a
d
d a minimum Per
l
drier
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
J
o
nathan Nied
e
r
t4034 (diff --word-diff)
:
s
t
yl
e
suggestio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Jonath
a
n Nieder
user
d
iff:
simplify word-diff sa
f
eg
u
ar
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Tho
m
as R
a
st
t4034: bulk veri
f
y b
u
i
l
t
i
n w
o
rd rege
x
sanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-18
Ramkumar
R
a
m
acha
n
dra
fast-i
m
port: Intr
o
duce --impo
r
t-marks-if-exists
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-16
J
o
nathan
Nie
d
er
ll-merge: si
m
plify opts ==
N
ULL
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-01-13
Junio C Hamano
Gi
t
1
.
7
.
4-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next