repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
octopus: make merge process simpler to follow
2009-12-14
S
t
ephe
n
Boyd
octopus: ma
k
e
merge
p
rocess simpler to follow
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
J
u
ni
o
C Ham
a
no
Fix archi
v
e form
a
t with
-- o
n
the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
Hamano
R
emove
p
ost-uplo
a
d
-hoo
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge bra
n
c
h
'mm/maint-m
e
rge-
f
f-erro
r
-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hama
n
o
M
e
r
ge
b
ranch
'jn/maint-pull-rebase-error-message' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Jun
i
o C Hamano
Merge b
r
anch 'jk/maint-ad
d
-p-delete-fix' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-
i
nte
r
a
c
t
ive: fix dele
t
ion of non-empty f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Gi
t
1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
L
inus Torvalds
Fix diff
-
B/--dirstat m
i
scou
n
ting of newly adde
d
contents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
r
e
set: i
m
prove
w
orktree safety
v
alve
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullin
g
e
r
D
ocumentation: Avoid use of xmlto -
-
stri
n
gp
a
ram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
R
e
n
é Scharfe
archive:
clarify d
e
scriptio
n
of path param
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Je
f
f K
i
n
g
rer
e
re: don't segfaul
t
o
n
failure to open rr-cach
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
P
repare for 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
M
e
rge
b
ranch 'uk/main
t
-s
h
ortl
o
g-enc
o
d
i
ng' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
H
am
a
no
Merge branch 'fc/
m
a
i
n
t
-format-patch
-
pathspec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
i
o C
H
a
m
ano
Merge branch 'ap/main
t
-merge-strategy-list-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio
C
Haman
o
Merge branch 'jc/maint-am-keep' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
b
ranch 'rs/work-around-grep-opt-
i
nsanity' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ham
a
no
Merge bran
c
h 'rj
/
m
ai
n
t
-cygwin-
c
ount-objects' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
m
ano
Merge br
a
nch 'mm/maint-hint-failed-m
e
rge'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'th
/
maint
-
remote-update-h
e
lp-str
i
n
g'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge branch
'
rj/maint-t9700
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Ha
m
ano
M
e
rge bran
c
h
'ls/
m
aint-mailinfo-no-inbody' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Hamano
Merge br
a
nch 'mo/maint-crlf-doc' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Ha
m
a
n
o
Mer
g
e
b
ranch '
t
h
/
remote-usage' into
maint
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge b
r
anch 'pb/m
a
i
n
t-use-custom-per
l
' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge branch 'mm/c
o
nfig-
p
athna
m
e-tilde-expa
n
d
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
n
o
Me
r
ge branch
'
bc/
g
rep-
i
-F'
int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge b
r
anch 'jk/maint-break-rename-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
rj
/
maint-
s
imp
l
i
fy
-
cyg
w
i
n
-makefile' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
M
e
rge bra
n
ch 'rg/d
o
c-workflow' into m
a
int
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merg
e
b
r
a
nch 'np
/
maint-sideb
a
nd-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Haman
o
Documentat
i
on: xmlto 0
.
0
.
18 does not know -
-
strin
g
param
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t4201: use ISO
8
859-1
rather tha
n
I
S
O-8859-
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ja
n
Krüger
pull: c
l
arify advice for the unconfigured
e
rror 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 Hamano
U
nc
o
nditionally set man
.
b
as
e
.
url
.
for
.
relative
.
li
n
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Docume
n
tation/Makefil
e
: allow man
.
base
.
url
.
for
.
rel
a
t
ive
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Haman
o
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
merg
e
:
d
o not add standard message wh
e
n messag
e
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Hama
n
o
Do
no
t
m
i
sidentify "
g
it merge f
o
o
HEAD" a
s
an old-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
v
id
A
gui
l
ar
help: D
o
not unnecessarily look for a repo
s
i
t
o
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael
J
Gruber
Document
a
tion: 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
Da
v
id
S
oria Parra
D
ocumentat
i
on: Documen
t
--br
a
nch o
p
tion in git c
l
one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthi
e
u Moy
builti
n
-merge:
show
user-friendly
error m
e
s
sages for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merg
e
-r
e
cursiv
e
:
make
t
he er
r
or-message generation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Avery Penn
a
run
b
u
ilti
n
-merge
.
c: c
a
ll exclude_cmd
s
() correct
l
y
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C Hamano
Remove dead code
f
rom "gi
t
am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
F
elipe Contreras
forma
t
-patc
h
:
a
dd
tes
t
for parsing of "-
-
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Felipe
Contreras
format-patch: fix parsing of "--" on the c
o
mmand lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
J
unio C Hamano
b
uiltin-apply
.
c
: pay
attention to -p<
n
> w
h
en
d
e
termining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uw
e
Kl
e
in
e
-König
short
l
o
g: respect commit enc
o
d
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Nicolas Pitre
pa
c
k-objects: spl
i
t
implications
o
f --all
-
progress
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Stephen Boyd
instaweb: rest
a
rt
s
er
v
er if alread
y
running
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Je
f
f King
p
rune-pac
k
ed:
o
nly
show progress when s
t
derr
i
s
a
tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Junio C H
a
mano
Protect scripted Porcelains f
r
om G
R
EP_OPT
I
ONS insani
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
R
e
n
é Scharfe
mergetool--lib
:
simplif
y
guess_merge_to
o
l()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
us
e
r-manual:
D
ocument th
a
t
"git merge" doe
s
n't
like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu
Moy
merge-recur
s
ive: point the user to commit when file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio
C Hamano
D
ocumentat
i
o
n: avoid xmlto
in
p
ut error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Raman Gupta
Add br
a
nch m
a
nagemen
t
for re
l
eases
t
o gitworkflows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Luk
a
s S
a
nd
s
tröm
git am
/
m
a
i
linfo: Don'
t
look at in-bo
d
y headers when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Tim Henigan
git
remote: Separate usage
s
trings
for
s
ubcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
diffc
o
re-rename:
reduce memory fo
o
tprin
t
by
fr
e
ein
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jones
git-coun
t
-o
b
jects
:
F
ix a disk-space under-es
t
imate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Greg Pri
c
e
Docu
m
entation: undocument gc
'
d
functi
o
n
g
raph
_
release()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsa
y
Jo
n
es
t9700-perl-git
.
s
h
:
F
ix a test fa
i
lure on Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-19
M
a
tthieu Moy
exp
a
nd_user_pat
h
: expand
~
to $HOME, not to the act
u
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-18
Matthieu
M
oy
Expand ~ and ~us
e
r in c
o
re
.
excl
u
desfile, comm
i
t
.
tem
p
late
amended by
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
P
hilippe Bruhat
.
.
.
Make sur
e
$PERL_
P
ATH is de
f
in
e
d
w
hen
the test
suit
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Matt
h
ew
O
g
ilvie
core
.
a
u
tocrl
f
documentation: ment
i
on the crlf attri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Brian Co
l
l
i
ns
g
rep:
A
llow case i
n
sensitive search
o
f fixed-strings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
e
ff
K
ing
dif
f
core-bre
a
k
:
save
c
nt_data
f
or
o
t
h
e
r ph
a
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcore-brea
k
: free filespec
dat
a
as we go
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Git 1
.
6
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o
C Hamano
Me
r
ge
branch 'b
s
/maint-p
r
e
-commit-hook-s
a
mple
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C Hama
n
o
Merge bran
c
h 'jk/maint-a
d
d-p-
e
m
pty'
i
n
t
o maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 'js/
m
aint-diff-color
-
w
o
rds
'
into maint
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o
C
Hamano
M
e
rge br
a
nch 'tz/main
t
-r
p
m'
into mai
n
t
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
Hamano
Me
r
ge br
a
nch 'j
k
/maint-format-patch
-
p-suppr
e
ss-stat
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io
C
Haman
o
M
e
rge
b
ranch
'pb/maint-gitweb-b
l
ob-
l
ineno' int
o
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Hamano
Me
r
ge branch
'jk
/
m
a
int-1
.
6
.
3-ls-files-i'
into
maint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hamano
Merg
e
b
r
anch 'vl/mai
n
t-openssl-signature-
c
h
a
n
g
e
' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
erge
branch 'jk/maint-push-
c
onfig' into
maint
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C Ham
a
no
M
erge b
r
anch 'sr/blame-
i
ncomplete' into maint
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C Hamano
Merge branch 'jc/m
a
in
t
-
bla
n
k-at-eof' i
n
to maint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C
Hama
n
o
Merge branch 'j
c
/maint-1
.
6
.
3-
g
raft-trailing-space'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 't
r
/maint
-
ro
f
f
-
quote' into
main
t
commit
|
commitdiff
|
tree
2009-11-16
J
unio C Hamano
Me
r
ge
branch 'ja/fetch
-
d
o
c' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 'cb/doc-
f
etch-
p
ull-m
e
r
g
e' into mai
n
t
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
Hamano
Merge br
a
nch 'jk/m
a
int-cvsimp
o
rt-pathnam
e
' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C H
a
mano
Merge
b
ranch 'jc/receiv
e
-
p
ack-auto' int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
a
m
a
no
Merge branch 'gb/maint-gitweb-esc-pa
r
a
m'
i
nto maint
commit
|
commitdiff
|
tree
2009-11-16
J
unio C Hamano
Merge
branch 'jn/gitweb-patch' into ma
i
nt
commit
|
commitdiff
|
tree
2009-11-15
T
im Henigan
Updat
e
'git re
m
ote update' usag
e
s
tring
t
o
m
atch m
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Todd Zullinger
Makefile: Ensu
r
e r
p
m packages can be re
a
d by old
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
S
t
ephen Boyd
git-ad
d
.
txt: fix formatting of -
-
patc
h
section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Nicolas Pitre
g
i
ve p
r
iority to prog
r
ess messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next