repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
octopus: reenable fast-forward merges
2009-12-14
S
tephen Boy
d
oct
o
pu
s
:
r
eenable
f
ast-
f
orward merg
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-14
Stephen B
o
yd
o
c
topus:
ma
k
e merge process simpler to fol
l
ow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Ha
m
an
o
Git 1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C
H
amano
Fix
arc
h
ive format with -- on the
c
omm
a
nd line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio C Hamano
Remo
v
e post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge b
r
anch
'
m
m/mai
n
t-merg
e
-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merg
e
b
r
an
c
h 'jn/maint
-
p
ull
-
r
e
base-err
o
r-me
s
sage' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ham
a
n
o
Mer
g
e
branch
'jk/main
t
-
add-p-delete-fi
x
'
into maint
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
a
d
d-
i
nteractive
:
fix deleti
o
n
o
f
non-
e
m
p
ty 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 T
o
r
v
alds
Fix diff -B/-
-
dirstat miscounting of newly add
e
d c
o
nte
n
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Jeff
K
ing
reset: i
m
prov
e
worktree safety valves
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinger
D
oc
u
mentation: Avoid
u
se of xmlt
o
--stringpar
a
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
Ren
é
Scharf
e
archive: clari
f
y description of
path para
m
et
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-04
J
e
ff King
r
e
r
ere:
don
'
t
segfa
u
lt on failu
r
e to op
e
n rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Pr
e
pa
r
e f
o
r 1
.
6
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
Merge bran
c
h 'uk/maint-shortlog-
e
ncoding' into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C
H
amano
Merg
e
branch
'
fc/maint-format-patch
-
p
athspec-dashe
s
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Merge branch 'ap/maint-merge-strategy-list
-
f
ix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
Merge branc
h
'
j
c
/m
a
int-am-keep' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge branch 'rs/work-around-grep-opt-insa
n
i
t
y'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C Hamano
Merge branch 'rj/main
t
-cyg
w
i
n-c
o
unt-objects' into
m
ain
t
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
M
e
rge
b
ranc
h
'mm/maint-hint-failed-m
e
r
g
e
'
into
m
a
in
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge b
r
a
nch
'
t
h/maint-
r
emote-
u
pdate-h
e
lp-st
r
ing' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ha
m
a
n
o
Me
r
ge branch 'rj/maint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch
'l
s
/maint-m
a
ili
n
fo-no-inbody' into
ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio C H
a
man
o
Me
r
ge branch 'mo/m
a
int-crlf-
d
o
c
'
int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
nio C Ham
a
no
Merge bran
c
h 'th/remote-usage' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Merge branch 'pb/maint-us
e
-
cus
t
om-
p
erl'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge
branch 'mm/config-pathname-ti
l
d
e
-expand' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
a
mano
Merge bran
c
h
'bc/grep-i-F' into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Merge
b
ranch 'jk/mai
n
t-b
r
eak-ren
a
me-reduce-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
ano
Merge br
a
nch 'rj
/
m
a
int-simplif
y
-cygwin
-
makefi
l
e' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
M
e
r
g
e
branch
'rg/doc-
w
orkflow'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hama
n
o
Merg
e
branch
'np/maint-sideband-favor-status' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Docume
n
tat
i
on: xmlto 0
.
0
.
18 do
e
s not know --strin
g
p
aram
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Bran
d
on Casey
t4201: use IS
O
8
8
59
-
1 rather than ISO-8859-
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
J
a
n Krüger
p
u
ll
:
clarify advic
e
for the
u
n
c
onfigure
d
error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o C Ha
m
ano
Git 1
.
6
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Haman
o
U
n
c
on
d
itionally set man
.
base
.
url
.
f
or
.
relative
.
l
inks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Hamano
D
ocumentation/Makef
i
le: allow man
.
ba
s
e
.
url
.
f
or
.
relat
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
J
un
i
o C Haman
o
Prep
a
re 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
: do
not add st
a
ndard
m
essa
g
e when messa
g
e
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not misidentify "git
merge fo
o
H
E
A
D" as
a
n old-styl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Agu
i
lar
help: Do n
o
t unn
e
cessa
r
i
ly
look for a repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Grub
e
r
D
o
cumentat
i
on
:
Fix a few
i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
D
a
vid Soria
P
arra
Documentation
:
Documen
t
-
-
b
ranch option in git clone
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Mat
t
h
ieu Moy
builti
n
-
m
erge
:
sh
o
w use
r
-f
r
iendly error mes
s
ag
e
s for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
M
atthieu Moy
m
e
r
ge-re
c
ursive:
m
ake the
e
rr
o
r-mes
s
age gen
e
r
ati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-30
Avery Pennarun
builtin-merge
.
c: call
exclude
_
c
m
ds() correc
t
ly
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C Hamano
R
emo
v
e dead code fro
m
"git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
F
e
lipe C
o
ntreras
fo
r
mat-patch:
a
d
d
te
s
t for par
s
ing o
f
"--"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
F
e
li
p
e
C
ontr
e
ras
fo
r
mat-
p
atch: f
i
x par
s
i
n
g of "--" on the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C
H
amano
builtin-apply
.
c: pay at
t
ention to -p<n
>
when determining
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Uwe Kleine-König
shortl
o
g: respect commit en
c
oding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Nicolas Pitre
pack
-
objects:
s
plit i
m
p
lications of --all-prog
r
ess
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Stephen Boyd
instaweb
:
rest
a
rt s
e
rve
r
if already runnin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
p
r
u
ne-packed: on
l
y
s
how pr
o
gr
e
s
s when st
d
err is a tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hamano
P
rotec
t
scripted Porcelains from GR
E
P_OP
T
IONS
i
nsanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
R
e
n
é
Scharfe
mergetool--l
i
b: simplify gu
e
ss
_
merge_tool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
us
e
r-man
u
al: Do
c
u
men
t
that "gi
t
me
r
ge"
d
oesn't like
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
merge
-
rec
u
r
sive: po
i
nt the use
r
to commit when
file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Junio C H
a
ma
n
o
D
o
cumentation: a
v
oid xmlt
o
inpu
t
error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Raman Gupt
a
Add branc
h
ma
n
a
g
ement
f
or releases
t
o
gitworkflows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
L
u
kas Sa
n
dströ
m
git am/mai
l
i
n
fo: Don't look at
i
n-bod
y
headers when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Tim He
n
igan
git remote: Separate usage str
i
ngs fo
r
s
u
bcommand
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
J
unio C
Hamano
d
iff
c
ore-rename: reduce m
e
m
o
ry footprint b
y
fre
e
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
R
a
msa
y
Jones
git-cou
n
t
-
ob
j
e
c
t
s
: Fix a disk-space under-estimate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
G
r
eg Price
Documenta
t
io
n
: undocu
m
ent gc'd
function
graph_release()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-20
Ramsay Jon
e
s
t9700-perl-git
.
sh:
F
ix a test failure on Cygwi
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-19
Matth
i
eu Moy
e
xpand_user_path: expand ~ t
o
$HOME, not to the a
c
tua
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-18
Mat
t
hi
e
u Moy
Expand ~
and ~user in core
.
exclude
s
file, comm
i
t
.
t
e
mplate
amended by
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Ph
i
lippe Bruhat
.
.
.
Make sure $PERL_PATH is defined when the test
suite
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
M
a
t
t
h
e
w O
g
ilvie
core
.
aut
o
cr
l
f docum
e
ntation:
mention the crlf
a
tt
r
ibut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Brian Coll
i
ns
grep
:
Allow c
a
se
i
ns
e
nsi
t
ive search o
f
f
ixed-strings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jeff Kin
g
d
i
ffcor
e
-b
r
eak: save cnt_data for
o
ther phas
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
e
f
f King
diffcore-
b
reak:
f
ree
filespec d
a
ta as we go
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio 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
Merge br
a
nch
'b
s
/maint-pre-commit-hook-sample
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Hamano
Merge branch
'jk
/
m
a
i
nt-add-p-empty' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge
b
ranch
'js/mai
n
t-diff-color
-
words' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io
C
Hamano
Merg
e
branch 'tz
/
ma
i
nt-rpm' i
n
to maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge
b
r
a
nch 'jk/maint-format-patch-p-su
p
press-s
t
at
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C Ham
a
no
Merge branch 'pb/main
t
-
g
itweb-blob-lineno' into maint
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C Ham
a
no
M
erge br
a
nch 'jk/ma
i
nt-1
.
6
.
3-ls-
f
iles-i' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C Ham
a
no
M
erge branch 'vl/maint
-
openssl-s
i
gn
a
t
u
r
e
-change
'
into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hamano
M
erge bra
n
c
h 'jk/mai
n
t-push-conf
i
g'
i
n
to
main
t
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Hamano
Merge
b
ranch 'sr/blame-incomplete' into
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C H
a
mano
Merge branc
h
'j
c
/ma
i
nt-blan
k
-at-eof' into
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
erg
e
branch 'jc/maint-1
.
6
.
3-graft-trai
l
i
n
g-spa
c
e'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
Hamano
M
er
g
e
branch 'tr/maint-roff-q
u
ote' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Hamano
Mer
g
e
branch 'ja
/
fetch-d
o
c
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C Hamano
M
erge branch 'cb
/
doc-fetch-p
u
ll-merge' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C H
a
mano
Merge bran
c
h
'jk/maint
-
cvsimp
o
rt-pathname' into main
t
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C Hamano
M
e
r
g
e branch 'jc/receive-pack-auto' into maint
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C Hamano
Merge branch 'gb/
m
ain
t
-gitweb-e
s
c-param'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2009-11-16
J
unio C Hamano
Merge
bra
n
ch
'jn/gitweb-patch' int
o
maint
commit
|
commitdiff
|
tree
2009-11-15
Tim Heniga
n
U
pdat
e
'git remote update
'
usage string to
m
atch
man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Todd Zullinger
Makefile: Ensure r
p
m pack
a
ges can be read by older
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Stephen
B
oyd
git
-
add
.
txt: fix formatt
i
ng of --
p
a
tch secti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next