repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase -m: remember allow_rerere_autoupdate option
2011-02-10
Mar
t
in von Zweigbergk
rebase -m: rem
e
mber allow_rer
e
r
e_autoupdate o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: remember strategy and str
a
tegy opti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
vo
n
Zweig
b
e
r
gk
rebase: r
e
mem
b
er ver
b
ose option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase: extract
c
o
de for w
r
iting basic stat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
r
ebase: factor o
u
t sub comm
a
n
d
handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbe
r
gk
rebase: make
-v a ti
n
y bit more v
e
rbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zweigbergk
r
ebas
e
-i: align variable na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin v
o
n Zweigbergk
re
b
as
e
: show consis
t
ent
c
o
n
flict reso
l
u
t
i
on h
i
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
r
e
base
:
ext
r
act am c
o
de to
new source
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
igbergk
r
e
base:
ex
t
ract merge code to new
s
our
c
e file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zweigbergk
reb
a
s
e
: remove
$branch
as
s
yno
n
y
m for $o
r
ig_head
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbe
r
gk
r
e
b
ase -i:
s
upport --stat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Z
weigbergk
reba
s
e: factor o
u
t ca
l
l to pre-reba
s
e h
o
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor
out clean work tree check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zw
e
i
gbergk
reb
a
se:
factor out reference parsin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Z
w
eigbe
r
g
k
r
e
base: reorder
v
alidation st
e
ps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zweigbe
r
g
k
r
e
b
ase
-
i:
r
emove now unnec
e
s
s
ary
directory checks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zw
e
igbergk
rebase:
f
act
o
r out comma
n
d line option processin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
o
n Zw
e
igbergk
reb
a
se: align variabl
e
content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: ali
g
n varia
b
le na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweig
b
ergk
rebas
e
: stricter check of standalon
e
sub command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zwe
i
g
bergk
rebase: ac
t
on comma
n
d line
outside parsing loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n v
o
n Zw
e
igbergk
r
e
base: im
p
rove detection of
r
ebas
e
in pro
g
ress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
r
ebase: remove u
n
u
s
e
d rebase stat
e
'prev_hea
d
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Zwei
g
bergk
rebas
e
: read state ou
t
side loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
reb
a
se:
refactor reading of sta
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
Martin von Zweigbe
r
gk
rebase: cleare
r
names f
o
r directory var
i
abl
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
J
unio
C
Hamano
M
e
rge bra
n
ch 'tr/merge-
u
nborn
-
cl
o
bber'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
e
rge br
a
nc
h
'jc/u
n
pack-tre
e
s'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
Merge br
a
nch 'jc/fsck-fi
x
es'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merg
e
br
a
nch 'tr
/
diff-words-t
e
st'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io
C Hamano
Merge branch 'rr/fi-
i
mp
o
rt-marks-if-
e
xists'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
er
g
e branch 'jn/u
n
pack-
l
st
a
t
-
failure-
r
eport'
commit
|
commitdiff
|
tree
2011-02-10
Junio C H
a
mano
Merge
b
ran
c
h 'ef/alias-via
-
run-c
o
mm
a
nd'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Ha
m
ano
Merge br
a
n
c
h 'c
b
/setup'
commit
|
commitdiff
|
tree
2011-02-10
Junio C H
a
mano
Me
r
g
e
branch 'ae/better-template-failure-report'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
H
a
mano
Merge br
a
nch
'jn/cherry
-
pick-strate
g
y
-
o
ption'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch
'
m
aint-1
.
7
.
0' into
m
a
int
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Niede
r
fast-impo
r
t
:
introduc
e
"feature n
o
tes" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jon
a
than
Nieder
fa
s
t-impor
t
:
clarify
d
ocume
n
tation 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
Uwe
Kleine-König
Docume
n
t
ation/merge subtr
e
e
H
o
w
-
To: f
i
x typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jens Le
h
mann
pull: D
o
cument the "--[no
-
]re
c
u
r
s
e
-
s
u
bmodu
l
es" o
p
ti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Nieder
quote
.
h: simpl
i
fy
the i
n
cl
u
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễ
n
Thái N
g
ọc Duy
sha1_o
b
ject_i
n
fo: exa
m
ine cach
e
d_object sto
r
e 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
_file
.
c: move find_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 const to parse_{commit,tag}_bu
f
fer()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thá
i
N
g
ọc
D
uy
diff
:
support --cac
h
ed on unborn branc
h
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 Narebski
g
itweb: Ment
i
o
n
option
a
l
Perl modules in INST
A
LL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sitaram
Chamarty
post-receive-em
a
il: s
u
ppre
s
s error if
d
esc
r
iption file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
P
at Th
o
yts
t7407: fix line
e
ndings for mingw build
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Joh
a
nnes
Sixt
t4120-apply
-
po
p
t:
help
s
y
stems with
core
.
f
ilemode=false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
P
a
t Tho
y
ts
t3509: use unconstrained initial test to
s
etup rep
o
sit
o
ry
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Sixt
start_command:
f
l
u
s
h
b
u
f
fers in t
h
e
WIN
3
2 co
d
e p
a
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Shawn O
.
Pearce
bu
n
dle: U
s
e
O
FS_DELTA in bun
d
le
f
i
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C
Hamano
Me
r
ge branch 'jl
/
fetch-submo
d
ule-recursive' into
m
aint
commit
|
commitdiff
|
tree
2011-01-31
J
e
n
s
Lehmann
t5526: Fix wrong argument or
d
e
r 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 Hamano
fsck: do not
g
ive up too
e
arly
in fsck_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C
Ha
m
an
o
fs
c
k: dr
o
p unused
parameter f
r
o
m traverse_one_obje
c
t(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam
T
k
a
c
Don't pass "-
-
xhtml"
t
o h
i
ghtlight in
g
i
tweb
.
pe
r
l sc
r
ipt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C
H
amano
Merge
bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2011-01-27
Jonathan Nieder
re
b
a
se -
i
: clarify in-edit
o
r documentatio
n
o
f
"exec"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
eff King
te
s
ts:
san
i
tiz
e
mor
e
g
i
t envir
o
nment variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
un
i
o
C H
a
mano
Merge bra
n
c
h 'jn/fast-import-empty-
t
r
e
e
-removal' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jonat
h
an N
i
eder
fast-impor
t
:
treat filemodif
y
with empty tr
e
e as
d
elete
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Ki
n
g
rebase: give
a
better er
r
o
r me
s
sag
e
f
or bogus bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
eff Kin
g
re
b
as
e
: use expli
c
it "--
"
with checkout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio 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 Haman
o
Merge bra
n
ch 'as/use
r
diff-pas
c
al'
commit
|
commitdiff
|
tree
2011-01-24
Junio C
H
a
m
an
o
Me
r
ge bra
n
c
h 'jn/s
e
tup-fi
x
es'
commit
|
commitdiff
|
tree
2011-01-24
Jonathan N
i
eder
t1510: f
i
x
typo in the comm
e
nt of a test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Jun
i
o C Hamano
Documen
t
ation updates for 'GIT_WO
R
K_TR
E
E without
G
I
T_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jon
a
th
a
n
N
i
e
der
S
ubject: s
e
t
u
p:
o
ffi
c
ially support --
w
ork-tree without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonatha
n
Nied
e
r
Documentation: do not treat reset --keep
as a specia
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
B
j
örn Steinbrin
k
Correctly re
p
ort corrupted objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
tests: compr
e
ss t
h
e set
u
p tes
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan
Ni
e
de
r
tests: cosmeti
c
improvements to th
e
rep
o
-set
u
p tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
i
o
C Hamano
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2011-01-19
Erik Faye-Lund
exe
c
_cmd: remove
u
nused
e
x
t
ern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hama
n
o
M
e
rge b
r
anch 'jn/g
i
tweb-no-logo'
i
nto maint
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C
Hamano
Mer
g
e br
a
n
ch 'jk/diff
-
drive
r
-binary-doc' i
n
to
maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
a
mano
M
e
rge branch 'tr/submodu
l
e-relat
i
ve-scp-url' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
ni
o
C Hamano
Merge branch 'rj/ma
i
nt-
d
ifft
o
ol-cy
g
wi
n
-workarou
n
d'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C Hama
n
o
M
e
r
ge
b
ran
c
h 'rj/maint-test-fixes'
i
nto maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge branch 'jn/maint-gitweb-pathinfo-fix'
into main
t
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge bra
n
ch
'
ak/descr
i
be-exact' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Ham
a
n
o
Me
r
g
e bra
n
ch 'jn
/
m
aint
-
f
ast-impo
r
t
-
objec
t
-reu
s
e'
into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
a
m
ano
Merge branch
'
j
n
/su
b
mod
u
le
-
b-c
u
rrent' into maint
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C Hamano
Merge branch 'jc
/
maint-sv
n
-info
-
test-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C
H
a
mano
Mer
g
e branch 'nd/
m
ai
n
t-relative' into m
a
int
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
Documentati
o
n
/
f
ast-imp
o
r
t:
p
ut exp
l
anation o
f
M
040
0
00
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay
J
ones
svndum
p
.
c:
Fi
x
a
p
r
intf
format c
o
mpil
e
r w
a
rning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nieder
r
em
o
t
e
-ext: do not
se
g
fault
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
Jonatha
n
Nied
e
r
Do
c
umentation/fast
-
impor
t
: capit
a
lize beginning of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Junio C Hamano
t4034 (diff --wo
r
d-diff):
ad
d
a minimu
m
Perl dri
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
J
o
nathan Nieder
t
4034
(
diff --wor
d
-diff): sty
l
e s
u
ggestions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jona
t
han Ni
e
der
us
e
rdi
f
f: simp
l
ify word-dif
f
safeguard
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Thomas R
a
st
t4034:
bulk verify buil
t
in wor
d
regex sanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Ramkumar Ramachandra
fast-import: I
n
trod
u
ce --import-marks
-
if
-
e
x
ists
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-16
Jon
a
t
h
an Nieder
l
l-
m
erge:
s
implify
op
t
s ==
NULL case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next