repo.or.cz
/
git
/
jrn.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
Junio C Hamano
Mer
g
e branch
'sb
/
maint-oct
o
pus' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
J
unio C Hamano
M
erge branch 'bg/main
t
-add-all-doc' into mai
n
t-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-29
Je
f
f King
f
ix memcpy of overlapping
are
a
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
Jun
i
o C Hamano
Merge branch '
j
k/maint-1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
an
o
M
e
rge branch 't
r
/ma
i
n
t
-1
.
6
.
5-b
a
sh-prompt-show-su
b
modul
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Me
r
ge
b
ranch 'dp/maint
-
1
.
6
.
5-fast-impor
t
-non-co
m
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'jm/maint-1
.
6
.
5-grep-N
U
L-termina
t
e' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
H
amano
M
e
rge branch 'maint-1
.
6
.
4' int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge
b
ranch 'main
t
-
1
.
6
.
3' into m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Ha
m
ano
Merg
e
branch 'mai
n
t-1
.
6
.
2
' into main
t
-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge commit
'
v
1
.
6
.
4
.
4-8-g8d
e
6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mi
s
-backport of
t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jim
Me
y
ering
grep: NUL
t
erminate input
f
rom a f
i
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dmitry Potapov
fast-import: tag may point to any object type
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge
branc
h
'
m
a
int-1
.
6
.
1'
i
n
t
o mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hama
n
o
M
e
rge br
a
nch 'maint-1
.
6
.
0'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-10
Andrea
s
Gruenbacher
base85: Make the code more o
b
vious
instead of
explaining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
And
r
eas Gruenbacher
base85:
e
n
code_85
(
) does not u
s
e the decode t
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
And
r
eas
Gr
u
en
b
acher
base85 de
b
ug
code: F
i
x length
byte c
a
lculation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Bjö
r
n
G
u
s
t
a
vs
s
o
n
git-rm doc: D
e
s
c
ribe how to s
y
nc index &
w
ork tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Hamano
check
o
ut -m: do not
try to
fall back to --merge
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
Matthieu
M
oy
branch:
d
i
e
exp
l
i
c
itly why when calling "git branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-31
Thomas R
a
st
bash co
m
pletion: factor submod
u
les in
t
o d
i
rt
y
s
t
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Jeff
Kin
g
t
e
xtc
o
nv: s
t
op le
a
king
file descr
i
ptors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
r
e
set
:
unbrea
k
hard resets
w
ith GIT_W
O
RK_TREE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
J
unio
C
Hamano
Merge branch 'maint-1
.
6
.
0'
int
o
ma
i
n
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-30
Greg Pr
i
c
e
commit: --cleanup is a
m
essag
e
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
And
r
eas S
c
hwab
g
it count-
o
bjects
:
handle pac
k
s bigg
e
r than 4G
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Nguyễn Thái Ngọ
c
Duy
t7102: ma
k
e the test fai
l
i
f
one
o
f its check fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Da
v
id Reiss
Preven
t
git b
l
ame from segfaulting on a mi
s
s
i
ng author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Björn G
u
stavsson
re
b
as
e
-i
:
abort cleanl
y
if the
editor
f
ai
l
s to launch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boy
d
technical-docs:
d
ocument ha
s
h
AP
I
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
api-strbuf
.
txt:
f
ix typos and docume
n
t l
a
unch_edi
t
or()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Gi
t
1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Hamano
work
t
ree: do
n
'
t segfau
l
t
w
it
h
a
n
abso
l
ute paths
p
e
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
i
g
nore
unk
n
own
col
o
r configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Six
t
help
.
a
u
tocorrect: do not run a command
i
f the command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shirais
h
i
Illustr
a
te "filte
r
"
a
ttri
b
ute with an
exa
m
ple
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-14
Stephen Boyd
octopus:
r
em
o
ve dead code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-14
Stephen Boyd
octopus: reenab
l
e fast-for
w
ard
merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-14
Stephe
n
Boyd
oc
t
opus: make merge process simpler to follo
w
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hama
n
o
Gi
t
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Ham
a
no
F
i
x archive form
a
t w
i
th -- on th
e
command
l
ine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C H
a
mano
Remove p
o
st-upload-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hama
n
o
Merge
b
ra
n
ch 'mm/ma
i
nt-merge-ff-err
o
r-me
s
sage-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C H
a
ma
n
o
Merge branch 'jn/maint-p
u
ll-rebase-e
r
ro
r
-me
s
s
age
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Merge branch
'jk/mai
n
t-add-p-delete-fi
x
' in
t
o
maint
commit
|
commitdiff
|
tree
2009-12-08
Je
f
f
K
in
g
ad
d
-interact
i
ve:
f
ix deletion
of non-empty
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-07
Björn Gusta
v
sson
git-add/rm doc: Consistently back-qu
o
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-07
Björ
n
Gusta
v
sson
Documentat
i
on: 'git add -A' can remove files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
unio C H
a
man
o
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvalds
F
i
x dif
f
-B/-
-
dirstat
miscounting of newly a
d
ded
co
n
tent
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff
K
ing
r
e
set: improv
e
w
orktre
e
safety valves
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
To
d
d
Zull
i
nger
Documentation: A
v
oid u
s
e
o
f
xmlt
o
--
s
tringpar
a
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René
S
c
h
ar
f
e
archive: clari
f
y descriptio
n
o
f path parame
t
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
r
e
r
er
e
: don't
s
egfa
u
lt on failu
r
e
to open r
r
-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
P
repare
f
or
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'uk
/
m
a
i
n
t-sho
r
tlog-encoding' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
a
no
Merg
e
branch 'f
c
/
m
aint
-
format-pa
t
ch-pathspec
-
das
h
es
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hama
n
o
M
erge bran
c
h
'
a
p/maint-merge-strategy
-
l
is
t
-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge br
a
n
ch 'jc/mai
n
t-am-k
e
ep'
in
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
M
erg
e
branch
'
rs
/
w
or
k
-aro
u
nd-grep
-
opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Merge branch 'rj
/
main
t
-cygw
i
n
-
count
-
objects' i
n
to main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge br
a
n
ch 'mm/m
a
int-hint-failed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
a
no
Merge branch
'
th/maint-remote-
u
pd
a
te-help-string'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Mer
g
e
branch 'rj/maint-t9700' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'ls/main
t
-mailinfo
-
no-inb
o
d
y
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Hamano
Merge
b
r
a
nch 'mo/m
a
int-
c
rlf-doc'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch
'
th/remot
e
-usa
g
e'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Merge branch 'pb/maint-use-custom-
p
e
r
l'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
erge branch 'mm/
c
onfig-pa
t
hname
-
tilde-expand
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Merge br
a
nch 'bc/grep-i
-
F
'
int
o
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Ha
m
ano
M
er
g
e branch 'jk/maint-b
r
ea
k
-rename-re
d
u
ce-mem
o
r
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
M
er
g
e branch 'rj/mai
n
t-simpl
i
f
y-cygw
i
n-makefil
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merg
e
b
ranch 'rg/doc-wo
r
kfl
o
w'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
aman
o
Merge b
r
anch 'np/maint-sideband-
f
a
vo
r
-s
t
atus'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Documentati
o
n: x
m
lt
o
0
.
0
.
18 does not k
n
o
w --stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
don Casey
t4201: use ISO8859-1 rather than ISO-
8
859-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ja
n
K
rüger
pu
l
l: clarif
y
a
dvice for the
u
nconfigured
e
rror
c
ase
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
Jun
i
o C Haman
o
Unconditionally set man
.
base
.
u
r
l
.
f
o
r
.
relati
v
e
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio
C Hamano
Prepare for 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
mano
merge:
d
o not add sta
n
dard mess
a
ge when
messag
e
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not misidentify "g
i
t
merge foo HEAD"
a
s an old
-
style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
David A
g
u
ilar
help: Do not unnecessar
i
l
y
l
o
o
k
for
a
r
e
positor
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
Documenta
t
ion: Fix a few
i
.
e
.
/e
.
g
.
mix-u
p
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
David
Soria Parra
Document
a
tion: Document
-
-branch option in git
clone
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
builtin-merge: sh
o
w
u
ser-friendly e
r
ror messages for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
M
a
t
t
hieu Moy
merge-
r
ecursive
:
make the
error-m
e
ssage
g
eneratio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Avery Pennarun
builtin-
m
erg
e
.
c: ca
l
l exclud
e
_cmds()
correctly
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Remove dead code from
"git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Fel
i
pe Co
n
t
reras
forma
t
-patch: add test for p
a
r
si
n
g
of "--"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contreras
forma
t
-p
a
tch: fix parsing of "-
-
" o
n
the command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
builtin-apply
.
c: pay
a
ttenti
o
n
t
o -p<n> when determini
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kle
i
n
e-König
short
l
og: respect commit encoding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
N
icolas Pitr
e
p
a
ck-objects: s
p
l
i
t impli
c
a
t
i
o
n
s of
-
-all
-
progress
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Stephe
n
Boyd
instawe
b
: restart server i
f
alrea
d
y running
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
Jeff Ki
n
g
p
r
une-
p
acked: only
s
h
o
w
p
r
ogr
e
ss when stderr
is a
tty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-24
J
un
i
o C
H
amano
Protect scr
i
pt
e
d P
o
rce
l
ains f
r
om GR
E
P_OPTIONS insanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next