repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5
2010-01-20
J
unio C Hamano
Merge bran
c
h
'jk/maint-1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'tr/maint-1
.
6
.
5-bash-prompt-show-
s
ubmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge branch 'dp/maint-1
.
6
.
5
-
fast-import-non-
c
om
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
n
o
Merge bran
c
h 'jm/maint-1
.
6
.
5-gre
p
-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Me
r
ge branch 'm
a
i
nt
-
1
.
6
.
4' in
t
o mai
n
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch
'
maint-1
.
6
.
3
'
into
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
b
r
an
c
h 'mai
n
t
-
1
.
6
.
2' into
maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge c
o
mmit 'v1
.
6
.
4
.
4-
8
-g8
d
e65
1
8' into maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-bac
k
por
t
of t7
0
02
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jim Mey
e
ring
grep:
N
UL termi
n
at
e
in
p
ut from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dmitry
P
o
t
apov
fas
t
-i
m
port
:
t
a
g may point to any ob
j
e
ct t
y
pe
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
J
u
n
io C
H
aman
o
M
e
rge branch 'maint-1
.
6
.
1' int
o
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hama
n
o
Merge branch 'maint-
1
.
6
.
0' in
t
o mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-10
A
n
drea
s
Gruenb
a
cher
base85: Make the code
m
o
re ob
v
ious instead of exp
l
aining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Andreas
Gruenbac
h
er
base85:
e
nc
o
de_85(
)
does not use the decode table
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
A
ndreas Gruenb
a
c
h
er
bas
e
85 debug code: Fix length byt
e
calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ham
a
no
checkout -m: do not try to
f
a
l
l back to --me
r
ge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Ma
t
thieu
Moy
branch: die explicitly why when calling "git branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Thomas Rast
bash co
m
pletio
n
: facto
r
sub
m
odules into
d
i
rt
y
stat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
J
e
ff King
textconv: stop lea
k
i
n
g f
i
le desc
r
iptors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
J
e
ff King
res
e
t
:
unbreak har
d
resets with GI
T
_
WORK_TREE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Juni
o
C Hama
n
o
M
erge branch
'
mai
n
t-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-30
G
r
eg Price
commit: --cl
e
anup is
a
message
opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Andr
e
as Schwa
b
git coun
t
-objects: handle packs bigger
t
han
4
G
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Nguy
ễ
n Thái
N
gọc
D
u
y
t71
0
2: make the t
e
st fail if
o
ne of its check fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
D
avid R
e
iss
Prevent git blame from s
e
gfaulting on a
m
issi
n
g author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
B
j
ö
r
n Gustavsson
r
e
base
-i: abort cleanly
i
f t
h
e editor fails to launch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
t
echnical-docs: d
o
cument
h
ash
AP
I
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
B
oyd
api-st
r
b
uf
.
txt: f
i
x
t
ypos and doc
u
m
e
nt launch_ed
i
tor(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
worktree: don't seg
f
aul
t
wit
h
an ab
s
olut
e
p
a
thspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff
King
igno
r
e unknown color config
u
ra
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Sixt
help
.
autocorrect: do not run
a comma
n
d if th
e
comman
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Na
n
ako Shiraishi
Illustrate "f
i
lter" at
t
ri
b
ute with
a
n example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hama
n
o
Fix archi
v
e
format with --
o
n the c
o
mmand line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
R
e
move post-uplo
a
d-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
uni
o
C
Hamano
Me
r
ge branch
'
m
m/maint-merge-ff-err
o
r-message-f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C
H
amano
Merge branch 'jn/main
t
-p
u
ll-rebase-error-me
s
sage
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C
Hamano
Merge branch 'jk/ma
i
nt-add-p-delete-fix' i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-12-08
Jeff K
i
n
g
add-intera
c
tive: fix dele
t
ion of non
-
empt
y
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvalds
F
ix dif
f
-B/-
-
dirstat miscounti
n
g of newly added content
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
re
s
et: im
p
r
ove work
t
ree
s
afety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Z
u
llin
g
er
Documentation: Avoid
u
se of xmlto --stringp
a
ram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Schar
f
e
archive: cl
a
rify des
c
ri
p
ti
o
n of path
par
a
meter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
J
eff Ki
n
g
re
r
ere:
d
on't segfault on failure to open rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Prepare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Merge branch 'uk/maint-sho
r
t
l
og-encoding' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge
b
ran
c
h
'fc/maint
-
format-patch-pathspec-d
a
s
h
es
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h '
a
p/m
a
int-mer
g
e
-strategy-list-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branch 'jc/maint-a
m
-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Haman
o
M
e
rge branch 'rs/work-
a
round-grep-op
t
-
i
nsani
t
y' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Me
r
ge branch 'rj/
m
aint-cygwin-count-objec
t
s'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C H
a
m
ano
M
e
rge branch 'mm/
m
a
i
nt-hi
n
t-failed-merge' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge
b
ranch 'th/maint-re
m
ot
e
-update-help-s
t
ring' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge br
a
nch 'r
j
/
m
a
int-t
9
700
'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge
br
a
nch
'
ls/maint-m
a
ilinfo-
n
o
-
inbody' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
b
ra
n
ch
'mo/mai
n
t-cr
l
f-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge
b
ranch 'th/remo
t
e-usage
'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch 'pb/m
a
int-use-custom-perl' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bra
n
c
h
'
mm/config-pathname-ti
l
de-expand'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branch 'bc/
g
rep-i-F' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
M
e
rge branch 'jk/maint-
b
reak
-
rename-reduce
-
memo
r
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Merge branc
h
'rj/maint-si
m
plify-cygwi
n
-makefile' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C H
a
mano
Merg
e
branch 'rg/doc-workf
l
ow' into
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge branch
'
np/maint-
s
ideban
d
-
favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
a
no
Documentation:
xmlt
o
0
.
0
.
18 does not kno
w
--stringp
a
ram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
B
rand
o
n Casey
t4201: use ISO8859-1 r
a
ther than ISO-
8
8
5
9-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ja
n
Krüger
pull: clarify
advice for the unconfigured error
c
a
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Unconditionally set man
.
b
ase
.
url
.
for
.
re
l
ative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Doc
u
mentati
o
n/Makefile: allow man
.
b
a
se
.
u
r
l
.
for
.
relative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Pre
p
are for
1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
Hamano
merge: do not add st
a
ndard mes
s
age when
m
es
s
age is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Jun
i
o C Hama
n
o
Do n
o
t
misidentify "g
i
t merge foo HEAD" as an
o
l
d
-
style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguilar
h
elp: D
o
no
t
unnecessarily look for a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gru
b
er
Documentati
o
n: Fix a few
i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Davi
d
Soria Parra
Docu
m
entation:
Document --branch option in git clon
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matth
i
eu M
o
y
bui
l
tin-mer
g
e: sh
o
w user-fr
i
e
n
dly
error message
s
f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthi
e
u
Moy
merge-rec
u
r
s
ive: mak
e
t
h
e
error-message gene
r
at
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
A
v
e
ry Pennarun
builtin-
m
erg
e
.
c: c
a
ll exclude_cmds()
c
or
r
ectl
y
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Rem
o
ve dead
code from "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Feli
p
e Contreras
f
o
rmat
-
patch: add test for parsing
o
f
"--"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contrer
a
s
format-patch: fix parsing of "--"
on the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
ma
n
o
b
u
i
lti
n
-
apply
.
c:
p
ay attention to -p
<
n> when determ
i
ning
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine-
K
ön
i
g
shor
t
log: r
e
spect commi
t
encoding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Nico
l
as
Pitre
pack-o
b
jects: spli
t
implica
t
ion
s
of
--all-progre
s
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Stephen Boyd
inst
a
w
eb: restart server i
f
already runnin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune-packed:
o
nly show pr
o
gress
wh
e
n
stder
r
is
a tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
J
uni
o
C
H
am
a
no
Pr
o
tect scr
i
pted P
o
rcelains from GREP_OPTIONS insa
n
ity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René Scha
r
f
e
mergetool--lib: sim
p
lif
y
gu
e
ss
_
merge_tool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu
Mo
y
user-manua
l
: Document that "g
i
t merge"
d
oesn
'
t lik
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthi
e
u Moy
merge
-
r
ecursive: point the
u
ser
t
o
c
omm
i
t
when file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Documen
t
ation: avoid xmlto i
n
put error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
R
aman Gupta
A
d
d branch ma
n
a
gement for releases to
g
itwor
k
f
lows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Lukas San
d
s
tröm
git am/mailinf
o
: Don'
t
look at i
n
-
b
ody h
e
ade
r
s
w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Tim
H
enigan
git remote: S
e
pa
r
a
te
u
sage
str
i
ngs for subco
m
m
a
nds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o C Hamano
diffc
o
re-rename: reduce memory footprint
by
fr
e
eing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Rams
a
y Jo
n
es
git-count-objects:
F
i
x
a d
i
s
k-s
p
a
c
e under-esti
m
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next