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 'sb/maint-octopus' into maint-1.6.5
2010-02-01
Juni
o
C H
a
ma
n
o
Merge b
r
anch 'sb/maint-octopus' into maint
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Junio C
H
am
a
no
Merge br
a
nch 'bg/maint-add
-
all-doc' i
n
to mai
n
t
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-29
J
e
ff King
fix me
m
cpy of o
v
e
rlapping area
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jk
/
maint-1
.
6
.
5-reset-hard' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
Mer
g
e branch 'tr/maint-1
.
6
.
5-bas
h
-pr
o
mpt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge br
a
nch 'dp/maint
-
1
.
6
.
5
-
fast-
i
m
port
-
non-c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branc
h
'
j
m/maint-1
.
6
.
5-grep-NUL-
t
erminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
H
amano
M
er
g
e branch 'maint-1
.
6
.
4' into maint
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Mer
g
e branch 'maint
-
1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-1
.
6
.
2' into ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v
1
.
6
.
4
.
4-8
-
g8de6518' int
o
m
a
int
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Fix mis-backport o
f
t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ji
m
Meye
r
i
n
g
grep: NUL terminate input from a
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dmitry Pota
p
ov
fast-impor
t
: tag may po
i
nt
to any
o
bject
type
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
mano
Merge branch 'maint-
1
.
6
.
1' into ma
i
n
t
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge b
r
anc
h
'main
t
-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-10
Andr
e
a
s Gr
u
enbacher
base85: Ma
k
e t
h
e
code more obvi
o
us instead of e
x
plaining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
And
r
ea
s
G
r
ue
n
bacher
base85: e
n
c
ode_85() does not
u
se th
e
decode table
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Andreas Gruenbacher
base85 debug code: Fix l
e
ngth
byte c
a
lcu
l
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
B
jörn
G
ustavss
o
n
git-rm d
o
c: Descri
b
e ho
w
to sync in
d
ex &
w
ork tre
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C
H
am
a
no
checkout -m: d
o
not try to fall back to --merg
e
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
M
a
t
t
hieu Moy
branch: die
e
xplic
i
tl
y
why when c
a
lling "git branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
Thomas Rast
bash completion: factor
submodules in
t
o dirty sta
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Jef
f
K
i
ng
te
x
tc
o
nv:
stop leaking
f
i
le
d
e
s
cripto
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Jeff
King
reset:
u
nbreak hard resets
with GIT_WORK_
T
RE
E
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
0' into main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-30
Greg
Price
co
m
mit
:
--cle
a
nup is a m
e
ssage opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
An
d
reas Schwab
git co
u
nt-o
b
jects: handle pa
c
ks bigger than 4G
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Ngu
y
ễ
n
T
hái Ngọc Du
y
t7
1
02: make the test fail if one of its c
h
eck fail
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Preven
t
git b
l
ame from segfaulting o
n
a
m
issing author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Björn Gustavsson
rebase -i: ab
o
rt c
l
e
anl
y
if t
h
e e
d
itor
fail
s
to launch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Steph
e
n
B
oy
d
t
e
ch
n
ical
-
docs:
d
o
cument h
a
sh API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephe
n
Boyd
ap
i
-
strbuf
.
txt: fix typos
a
nd document launch
_
editor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
G
it 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
unio C Hama
n
o
wo
r
ktree
:
do
n
't se
g
fault wi
t
h
a
n
a
bsolute p
a
thspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
e
ff King
ignore
u
nknown color configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Sixt
help
.
autocor
r
ect: do not run a co
m
mand
i
f
the command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nanako
S
hirais
h
i
Illus
t
rate "filter" att
r
i
b
ute with a
n
exa
m
ple
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-14
Stephen B
o
yd
o
ctopus: re
m
ove dead code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-14
S
t
ephen Boyd
oct
o
pus: reenable fast-forward merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-14
Stephen Boy
d
octopus: make merge process simple
r
t
o
follow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
Hama
n
o
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
m
ano
Fix archive format wi
t
h --
on the command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Hamano
R
e
move post-upl
o
ad-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hama
n
o
Merge branch 'mm/ma
i
n
t
-merge-ff-er
r
or-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merg
e
b
ranch 'jn
/
maint
-
pull-rebase-error-
m
es
s
a
g
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jk
/
mai
n
t-add-p-de
l
ete-fix' int
o
main
t
commit
|
commitdiff
|
tree
2009-12-08
Je
f
f
Kin
g
add
-
interactive: fix
deletion of
n
on-empty f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-07
Björn Gustavs
s
on
git-add/rm doc: Consistent
l
y back-qu
o
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-07
Björn Gus
t
a
vsson
D
oc
u
m
entation: 'git
a
d
d -A' can remove f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torva
l
d
s
Fix diff -B/--dirstat m
i
scoun
t
ing
of n
e
wly added contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Je
f
f
K
ing
reset:
impro
v
e workt
r
ee safet
y
valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zulling
e
r
Docum
e
ntation: Avoid use of xmlto --stringpara
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Sch
a
rfe
archive: clarify description of path parame
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff
K
ing
rerere
:
d
o
n't s
e
gfaul
t
o
n f
a
i
lure t
o
open
r
r-ca
c
he
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
mano
Prep
a
re f
o
r 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hama
n
o
Mer
g
e branch
'
uk
/
m
a
int-s
h
ort
l
og
-
encoding' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e
branch 'fc/m
a
in
t
-format-patch-pathspec
-
d
ashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C Hamano
M
e
rge b
r
anch
'ap/ma
i
n
t
-merge-strategy-list-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'jc/maint-a
m
-keep' into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge bran
c
h 'rs/work-around-grep
-
opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch
'
rj/
m
a
int-cygwin-count-obj
e
c
t
s' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
a
n
o
Merge br
a
n
ch 'mm/mai
n
t-hint-failed-m
e
rge' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'th/maint-remo
t
e-upd
a
te-help-string' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'rj/maint-t9
7
00'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Merg
e
bran
c
h 'ls/main
t
-
m
a
i
l
info-no-inbody' i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C H
a
mano
Me
r
g
e
branch '
m
o
/
m
a
int-crl
f
-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Mer
g
e
b
ranch
'
th/remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'pb
/
m
aint-use-custom-perl
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Me
r
g
e branch 'mm/con
f
ig-p
a
thname-tilde
-
expa
n
d'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch 'bc/g
r
ep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
M
e
rge bran
c
h 'jk/
m
aint-bre
a
k-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge branc
h
'rj
/
maint-simplify-cygwin-m
a
kef
i
l
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
M
erge bran
c
h 'rg/d
o
c-wor
k
flow' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge bran
c
h
'
np/
m
aint-
s
id
e
ban
d
-
fav
o
r-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Doc
u
m
e
nt
a
t
i
on: xml
t
o 0
.
0
.
18 does not know --stri
n
g
p
aram
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon
Case
y
t4201: use ISO885
9
-1 ra
t
her
t
han ISO-885
9
-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jan
K
rüger
pul
l
: clarify advic
e
fo
r
the uncon
f
igured erro
r
case
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
Ha
m
ano
Unconditionally set man
.
ba
s
e
.
url
.
fo
r
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio
C Hamano
Prepar
e
f
o
r 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Ha
m
a
n
o
me
r
ge: do not add standard mes
s
a
ge w
h
e
n m
e
ssage
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C
H
amano
Do no
t
misid
e
ntify "git
me
r
ge foo HEAD" as a
n
ol
d
-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
ui
l
ar
hel
p
: Do not unnecessarily look for a repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Mi
c
hae
l
J Gruber
D
o
cume
n
tation: Fix a few i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Da
v
i
d
Soria Pa
r
ra
Documentation: Docume
n
t
-
-branch
o
ption in git
c
l
one
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
M
atthieu Mo
y
builtin-merge: show
u
s
e
r
-friendly error
message
s
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
M
a
tthieu Moy
merg
e
-recursive:
m
a
ke t
h
e e
r
r
o
r-me
s
s
a
g
e generation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
A
v
ery
Pe
n
n
aru
n
builtin-m
e
rge
.
c: c
a
ll exclude_cmds() correctly
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ham
a
no
Re
m
ove dea
d
code f
r
om
"
git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Feli
p
e
C
ont
r
eras
format-patch: add test for parsing of "--"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Feli
p
e
Contreras
f
ormat
-
patch: fix parsing of "--"
on the c
o
m
m
an
d
line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Jun
i
o C H
a
m
an
o
built
i
n-
a
pply
.
c
:
pay
a
ttent
i
on to
-
p<n> w
h
en determining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Klein
e
-König
shortlog: respect commit encoding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Nicolas Pitre
pack-objects:
split im
p
lications of --all-progress
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Stephen Boyd
instaweb: r
e
start server if al
r
e
a
dy running
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
p
r
une-pack
e
d
: on
l
y sh
o
w pro
g
ress
w
hen stderr is a t
t
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Protect scr
i
pt
e
d Porcela
i
ns
f
rom GREP_
O
P
T
IONS insani
t
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next