repo.or.cz
/
git
/
mjg.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
Junio C Hamano
Merge branch 'jk/ma
i
n
t
-1
.
6
.
5-reset
-
hard' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge bran
c
h 'tr/
m
ai
n
t-1
.
6
.
5
-
ba
s
h
-
prompt-show-su
b
m
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ham
a
no
Merge bra
n
ch 'dp/maint-1
.
6
.
5
-fast-import-non-
c
omm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merge branch 'jm/maint-1
.
6
.
5-grep-NUL-
t
erm
i
na
t
e' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
Ha
m
a
no
Merge branch 'ma
i
nt-1
.
6
.
4
' into ma
i
n
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Haman
o
M
e
rge bran
c
h 'ma
i
nt
-
1
.
6
.
3' into
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Ham
a
no
M
erge
bran
c
h '
m
ain
t
-1
.
6
.
2' into
m
a
in
t
-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge commit 'v1
.
6
.
4
.
4-8-g8de6518' into ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hama
n
o
Fi
x
mis-backport of t7
0
02
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyering
g
r
ep: NUL term
i
nate
i
nput
f
r
o
m
a
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dmitry Po
t
ap
o
v
fast-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
Merge branch 'maint-1
.
6
.
1
' in
t
o
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
amano
Merge branch 'maint-1
.
6
.
0
'
into
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-10
A
n
dr
e
as Gruen
b
a
c
her
base85: Mak
e
the code mor
e
o
b
v
ious instead o
f
ex
p
laining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Andreas G
r
uen
b
acher
bas
e
85: encode_85(
)
doe
s
not use the decode table
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Andreas
G
ruenbacher
base8
5
deb
u
g code: F
i
x length by
t
e calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio
C Hamano
checkou
t
-m: do n
o
t
t
ry to fall
b
ack to --merge
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Matthieu Mo
y
branc
h
: d
i
e explicitly why when calling "git bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-31
Tho
m
as
Rast
bash completi
o
n
:
f
ac
t
or submodules
i
nto dirt
y
state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
tex
t
conv: s
t
o
p
l
e
aking f
i
l
e descrip
t
ors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Jeff Ki
n
g
reset: unb
r
eak
hard resets with
GIT
_
W
O
RK_TREE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
J
u
n
i
o
C Ha
m
ano
M
erge branch '
m
aint-1
.
6
.
0' in
t
o main
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-30
Greg Pri
c
e
commit
:
--cleanup is a me
s
s
a
ge option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Andreas Schwab
git count-object
s
: ha
n
dle packs bigger than 4G
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Ngu
y
ễn
Thái Ngọc Duy
t7102: mak
e
t
he test fail if one of its ch
e
c
k
fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
David Rei
s
s
P
re
v
ent git blame from segfaulting
o
n a
m
issing autho
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Björn Gus
t
a
v
sson
rebase -i:
abort cleanly if the edit
o
r fails to launc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
St
e
p
h
e
n Boyd
tec
h
nical-docs: do
c
u
ment
hash API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-18
S
tephen Boyd
api-str
b
uf
.
txt: fix typos and
d
ocument
lau
n
ch_
e
d
i
t
or()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
J
u
ni
o
C
Hamano
G
i
t 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
work
t
ree: don't segfa
u
lt with an absolut
e
path
s
pec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jeff K
i
ng
ignore u
n
known co
l
or configur
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Jo
h
a
nnes Sixt
h
e
lp
.
autocorrect: do not run
a
c
omma
n
d if the command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-15
Nanako Shiraishi
Illust
r
ate "filter"
a
ttribute with a
n
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Ham
a
n
o
G
i
t
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Fix arc
h
i
v
e
f
o
r
mat with -
-
on
t
he
command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C H
a
mano
R
emove post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge bran
c
h 'm
m
/maint-merge-ff-error-message-fi
x
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Juni
o
C H
a
ma
n
o
Mer
g
e
branch
'
j
n/m
a
int-pull-rebase-error-mes
s
age' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Ha
m
ano
M
erge
branch 'jk/m
a
int-add-p-delete-fi
x
' into
m
aint
commit
|
commitdiff
|
tree
2009-12-08
Jef
f
King
add-in
t
eractive: fix de
l
e
tion of non-empty
f
iles
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 To
r
vald
s
Fix diff -B/--d
i
rs
t
at misco
u
nt
i
ng of
n
e
wly added contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: i
m
prove worktree
safety va
l
ves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
T
o
dd Zullin
g
er
D
o
cume
n
t
a
t
i
on: Avoid use of xml
t
o --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
R
ené
S
c
harfe
ar
c
hive: clarify descr
i
ption of path parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
J
e
f
f
King
rerere:
d
on't segfa
u
lt on failure to ope
n
rr-
c
ache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ha
m
ano
Prepare f
o
r 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
Hama
n
o
Merge branch 'uk/maint-shortlo
g
-enco
d
in
g
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
m
ano
Merge
br
a
nch 'fc/maint-format-patch-pat
h
spec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C Hamano
Merge branch 'ap/maint-merge-strategy-lis
t
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'jc/maint-
a
m-keep
'
into main
t
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io
C Hamano
M
e
rge branch 'r
s
/work-arou
n
d-grep-opt-
i
nsanity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge branc
h
'rj/maint-cygwin-count-objects' into main
t
commit
|
commitdiff
|
tree
2009-12-03
J
uni
o
C
H
a
mano
Merge
branch '
m
m/ma
i
nt-hint-fail
e
d-merge'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch
'
t
h
/
maint-
r
e
mote-update-help-
s
tr
i
ng' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
M
erge branch 'r
j
/maint-t97
0
0' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merg
e
bra
n
c
h
'ls/maint-mailinfo-no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C Hamano
M
e
rge bran
c
h 'mo
/
maint-
c
rl
f
-
d
oc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ham
a
no
M
erge branch 'th/remote-us
a
ge' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
a
n
o
Merg
e
branc
h
'
pb/maint-u
s
e-custom-per
l
' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
n
o
Merge b
r
a
nch 'mm/config-path
n
a
m
e
-
tilde-expand'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ham
a
no
Merge bran
c
h 'bc/grep-
i
-
F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
a
no
M
erge
bran
c
h 'jk/m
a
i
nt-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
ama
n
o
Merge bran
c
h 'rj
/
m
a
i
nt-simplify-cygwin-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Me
r
ge
branch
'rg
/
doc-
w
orkflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
erge bran
c
h 'np/m
a
i
n
t-sideban
d
-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hama
n
o
Documenta
t
ion:
xm
l
to 0
.
0
.
18 does n
o
t kno
w
--stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bra
n
don
C
as
e
y
t42
0
1: use ISO8859-1 rather than ISO-8859-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Jan
K
rüger
pull
:
c
l
ar
i
fy ad
v
ice for the unconf
i
gured error case
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
U
n
conditio
n
ally set
m
an
.
base
.
u
r
l
.
for
.
relative
.
links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Docum
e
ntatio
n
/Makefil
e
: allow man
.
base
.
url
.
for
.
r
ela
t
ive
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
P
r
ep
a
r
e
for 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Ju
n
io C H
a
mano
mer
g
e:
d
o
not add standard
m
essage when message
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
am
a
no
D
o not
m
isidentify "git merge foo HEAD"
a
s an old
-
style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Aguila
r
help:
D
o
not unn
e
cess
a
rily look for a reposi
t
ory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michae
l
J
G
r
ub
e
r
Documen
t
ation: Fix a few i
.
e
.
/e
.
g
.
m
i
x
-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
David Soria
Par
r
a
Docum
e
n
t
ati
o
n
:
Document -
-
bra
n
ch
o
ption in gi
t
clone
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthi
e
u Moy
bu
i
l
t
in-mer
g
e
: show user-friendly
error messages fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merge-recursiv
e
: mak
e
the error-message generation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
A
very Pennarun
built
i
n-mer
g
e
.
c:
call
e
xclude_cmds() c
o
rrectly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C H
a
m
a
n
o
Remov
e
dead code
f
r
o
m "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe Contreras
fo
r
ma
t
-p
a
tch:
add test for parsing of
"
--"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe
Contreras
format
-
pat
c
h
:
fix pars
i
ng of
"--"
o
n the co
m
mand lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
un
i
o C Ham
a
no
built
i
n-appl
y
.
c: pay at
t
entio
n
t
o
-p<n>
w
h
en de
t
e
rmini
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine
-
König
s
hortlog: r
e
spect commit
enc
o
din
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
N
icolas Pit
r
e
pa
c
k-
o
bjects: split i
m
plications
of
-
-
a
l
l
-progress
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Steph
e
n
Boyd
ins
t
aweb
:
r
estart ser
v
er if already running
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
J
e
ff Kin
g
prune-packed:
o
n
l
y show progress
when stderr is a tt
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
J
unio C Hamano
Protec
t
scripte
d
Porcelains fro
m
GREP_OPTIONS insa
n
ity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René
S
char
f
e
mergetool--lib:
simplify guess_
m
erge_tool
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Mat
t
hieu Moy
user-
m
a
n
ual: Document that "git merge" doesn'
t
like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matt
h
ieu Mo
y
merge-recur
s
ive: point th
e
user
to com
m
it when file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Jun
i
o C Hamano
D
ocumentation: avoid
x
m
lto inpu
t
e
r
ror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Raman Gup
t
a
Add branc
h
ma
n
agement
for relea
s
es to g
i
t
w
orkflows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Lukas San
d
ström
g
i
t am/mail
i
n
f
o
: Do
n
't
look at
i
n
-
b
ody headers when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
T
im
Henig
a
n
g
i
t
remote:
Separate usage strings for subcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
di
f
fcore
-
rename: re
d
uc
e
m
e
mory footprin
t
by fr
e
eing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
R
a
msay Jone
s
git-count-objects: F
i
x
a dis
k
-sp
a
ce
u
n
der-es
t
imate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next