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
Ju
n
io C Hamano
M
e
rg
e
branch 'sb/maint-octopus
'
i
nto maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-02-01
Juni
o
C Hamano
Merge bran
c
h 'bg/m
a
int
-
add-all-doc
'
into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-29
Je
f
f King
fix memcpy of overlapping area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Ham
a
no
Merg
e
branch 'jk/main
t
-1
.
6
.
5
-r
e
se
t
-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'tr/maint-1
.
6
.
5-bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
Merge bran
c
h 'd
p
/
ma
i
nt-1
.
6
.
5-fast-im
p
ort-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Haman
o
Me
r
ge
b
ranch 'jm/maint-1
.
6
.
5-grep-NUL-terminate' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge
branch 'm
a
int-1
.
6
.
4'
into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C Hamano
Merge branch 'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merg
e
branch '
m
a
i
nt-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v1
.
6
.
4
.
4-8-g8de65
1
8'
i
n
to mai
n
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Fix mis-ba
c
kport
o
f t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyer
i
ng
grep: NUL termina
t
e input from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dmit
r
y Potapov
fas
t
-import: tag
may point t
o
any object type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
e
rg
e
branch 'mai
n
t-1
.
6
.
1' into ma
i
nt-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C
H
amano
Merg
e
branch 'maint-1
.
6
.
0
'
into
m
aint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-10
Andr
e
as Gruenbacher
base85: Make the cod
e
m
o
re
o
b
vious instead
o
f exp
l
a
i
n
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Andreas Gruenbacher
base85: encode_8
5
() d
o
es not use the decode
t
a
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
A
n
dre
a
s
Gru
e
nbacher
base85 debug
c
ode: Fix length byt
e
calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Björn
G
u
stavsson
git-rm doc: De
s
cribe how to sync i
n
d
e
x
& w
o
rk tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
chec
k
out -m: do
not try
t
o fa
l
l back to -
-
merge f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Matthieu Moy
br
a
nch: die ex
p
lic
i
tl
y
w
h
y when calling "g
i
t b
r
a
nc
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Th
o
mas Rast
bash completion: factor submodules into dirty state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
textcon
v
: stop l
e
a
k
i
ng
f
ile d
e
sc
r
i
p
tors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Jeff K
i
ng
reset:
u
nbreak
hard
r
esets w
i
th GIT_WORK_TREE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Me
r
g
e b
r
a
nch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-30
G
r
e
g Pri
c
e
commit: --cle
a
n
u
p is a message o
p
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Andr
e
as Schwab
git count
-
object
s
: handle packs bigger than 4G
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Nguyễn Thá
i
Ngọc Du
y
t7102
:
make th
e
t
e
st
f
ail if one of its chec
k
fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
David Reiss
Pr
e
v
e
nt
git blam
e
f
r
om s
e
gfaul
t
i
ng on a missing author
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Björn G
u
stavsson
rebase
-
i
: abort clean
l
y if the e
d
itor fails
t
o
launch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephe
n
Boyd
t
e
c
hnical
-
docs:
do
c
um
e
n
t
hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
Stephen
B
oyd
a
p
i-
s
tr
b
uf
.
tx
t
: f
i
x typos and document l
a
unch_edit
o
r()
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
w
orktree: don't
seg
f
ault with an abs
o
lute pathspec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Je
f
f
King
ign
o
re unknown color
c
onfi
g
u
r
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Johannes Six
t
he
l
p
.
auto
c
orrect: do not run a co
m
m
a
n
d if the command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
N
anako
S
hira
i
sh
i
I
llus
t
rate "fi
l
t
e
r" attribu
t
e with an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-14
Stephe
n
B
oyd
octopus: remov
e
dead
code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-14
Step
h
en Boyd
octopus: reena
b
l
e
fa
s
t-forward merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-14
Stephen
Bo
y
d
octopus: make merge process simpler to follow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C H
a
mano
G
it 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
amano
Fi
x
ar
c
h
i
ve fo
r
mat wit
h
-- on the comma
n
d line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remo
v
e
post-uplo
a
d-hoo
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
J
u
n
i
o C Hama
n
o
Merge
b
ra
n
ch 'mm/maint-m
e
rge
-
ff-error-mess
a
ge-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Ham
a
no
Merge
br
a
n
ch
'jn/maint-pull-r
e
base-error-messag
e
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
m
a
n
o
Me
r
ge
br
a
nch 'jk/mai
n
t-a
d
d-
p
-
d
elete-
f
ix
'
into maint
commit
|
commitdiff
|
tree
2009-12-08
Jeff Kin
g
add-interac
t
ive:
fi
x
delet
i
o
n of
non-empty fi
l
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-07
Björn Gusta
v
sson
git-add/rm doc:
Con
s
istently back-q
u
ote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-07
B
jörn Gust
a
vsson
Do
c
umenta
t
ion
:
'git add -A' can remove
f
iles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
G
i
t 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Linus Torvalds
Fix
d
iff
-B/
-
-dir
s
ta
t
miscounting of
newly a
d
ded
c
ontent
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: improve
w
orktree safety
v
alves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
Documentation: Av
o
id us
e
of xmlto --
s
t
r
in
g
p
aram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
René Scharfe
archive: clarify descri
p
tion of path parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere: don't segf
a
ult 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
Hamano
M
erge br
a
n
c
h 'uk/maint
-
shor
t
log-encoding' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
M
erge branch 'f
c
/maint-fo
r
m
at-patch-pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
erge
b
ranch 'ap/maint-mer
g
e
-strategy-lis
t
-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hama
n
o
Me
r
ge
b
ranch 'jc/maint
-
am-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
e
r
g
e branch
'
r
s/w
o
rk
-
around-
g
r
ep-opt-insanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'rj/maint-
c
y
g
win-
c
ount-objects' into main
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C
H
a
mano
Merge
b
ranch 'm
m
/maint-hint-fail
e
d-merg
e
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C H
a
m
a
n
o
Merge branch
'th/maint
-
remot
e
-update-help-st
r
ing
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge
branch 'rj/main
t
-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Merge branch '
l
s/
m
aint-mailinfo-no-inbody' in
t
o m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge branch
'
mo/main
t
-
c
rlf-doc' i
n
to maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Me
r
ge bra
n
ch 'th/remote-usage
'
into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge b
r
anch 'pb
/
maint-use-c
u
stom
-
perl' in
t
o
m
ai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branch 'mm/conf
i
g
-
pathname-tilde-
e
x
p
and' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
H
amano
Merg
e
branch 'bc/grep-i-F' in
t
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
n
o
Merge branch
'jk/mai
n
t-break
-
r
ename-reduce-mem
o
ry'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
un
i
o C Hamano
Merge branch
'rj/maint
-
s
i
mplif
y
-cygwin-
m
akefile' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge branch 'np/ma
i
nt-sideband-favor-st
a
tus' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documen
t
ation:
x
m
lto 0
.
0
.
18 d
o
es
n
ot
know --string
p
aram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Ca
s
ey
t4201:
u
se ISO8859-1 r
a
ther than ISO
-
8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
an Krüger
pull: clari
f
y advice for t
h
e unc
o
n
f
igured er
r
o
r cas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Hamano
Unconditio
n
ally
se
t
man
.
b
a
se
.
url
.
for
.
relat
i
ve
.
l
i
nks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documen
t
ation/Makefile: allow man
.
b
ase
.
url
.
for
.
r
e
lative
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hama
n
o
Prepare 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 a
d
d stan
d
ard messag
e
w
h
en messag
e
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hama
n
o
Do
not m
i
s
i
dentif
y
"gi
t
m
erge foo HEAD" as an old-
s
tyle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Dav
i
d
A
g
u
ilar
help: Do
not
u
nnecessarily look fo
r
a r
e
pos
i
t
ory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
M
i
chael J
G
ruber
Documentati
o
n
:
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
Dav
i
d So
r
ia
P
a
rra
Docum
e
n
tati
o
n: Document --branch
option in git
c
lon
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
builtin-m
e
rge: show user-frie
n
dly
e
rror mes
s
ages
fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
thieu
M
oy
mer
g
e-rec
u
rsi
v
e: mak
e
t
h
e e
r
ror
-
mess
a
ge
g
enerati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
A
v
ery
P
e
n
n
arun
builtin-
m
e
rg
e
.
c: call exclude_cmds() correctly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C
H
a
m
ano
Remove
dead
c
ode fro
m
"g
i
t
am
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Fel
i
pe Con
t
reras
format-patch:
a
d
d test for parsing of "--"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felip
e
Contr
e
r
a
s
format-pa
t
c
h: f
i
x parsing
o
f
"
-
-
"
on the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Haman
o
bu
i
lti
n
-
a
p
ply
.
c: pay
a
tte
n
tion t
o
-p<n> w
h
e
n
determinin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine-König
sho
r
tlog: respect commit encoding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
N
i
colas Pitre
pack-o
b
jects
:
split implications of -
-
al
l
-pr
o
gress
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Step
h
en Bo
y
d
i
n
staweb: resta
r
t
s
erver
if alre
a
dy running
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
prune
-
packed: only
show pr
o
gress
w
hen stderr is a tt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next