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
Merge branch 'tr/maint-merge-ours-clarification' (early part)
2009-11-23
Junio C Ham
a
n
o
Merge branch 'tr/ma
i
nt-merge-ours-clarif
i
cation' (early
.
.
.
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
log
-
-
format: document %
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René
Scharfe
strbuf_add_wrap
p
ed_text()
:
fact
o
r out st
r
buf
_
add_indented_
t
ext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
René Scharfe
grep: unset GREP_OP
T
I
O
N
S be
f
ore spa
w
ning external grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Bjö
r
n Gustavsson
User
M
a
n
u
al: Wri
t
e "Git" instead of "GIT"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Björn Gus
t
avsson
Fix
tr
u
ncated u
s
age
m
es
s
age
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
J
unio C Ha
m
ano
Merge branch 'jc/fix-tree-walk' (early part
)
commit
|
commitdiff
|
tree
2009-11-21
J
u
nio C Hamano
Mer
g
e branch 'jh/notes' (early part)
commit
|
commitdiff
|
tree
2009-11-21
J
unio
C H
a
mano
Merge branch '
s
p/s
m
ar
t
-
http'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
M
erge branch '
b
w/autoconf-more'
commit
|
commitdiff
|
tree
2009-11-21
Junio C H
a
m
ano
Mer
g
e branch '
j
n/editor-pager'
commit
|
commitdiff
|
tree
2009-11-21
J
uni
o
C
Haman
o
Merge branc
h
'rj/cygwin-msvc'
commit
|
commitdiff
|
tree
2009-11-21
J
u
nio C Ha
m
ano
Merge branc
h
'rj/m
a
int-simplify-cyg
w
in
-
makefile'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
M
erge branch 'bg/format-
p
a
tch-d
o
c-update'
commit
|
commitdiff
|
tree
2009-11-21
J
u
nio C Hamano
M
erge branch
'
tr/filter-
b
ranc
h
'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branch '
s
c/
p
rotocol-do
c
'
commit
|
commitdiff
|
tree
2009-11-21
Junio C H
a
mano
Merg
e
branch '
j
l/subm
o
dule-add-noname'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Hamano
M
erge branch 'sb/ls-tree-pars
e
opt'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Hamano
Merge branch 'rg/doc-
w
orkflow'
commit
|
commitdiff
|
tree
2009-11-21
Junio C Ham
a
no
Merge branch '
j
n/gitweb-log
-
history'
commit
|
commitdiff
|
tree
2009-11-21
Junio
C
Ham
a
no
Me
r
ge branc
h
'jn/hel
p
-everywh
e
re'
commit
|
commitdiff
|
tree
2009-11-21
Juni
o
C
H
a
man
o
Merge branch 'jp/fetch-cull-many-re
f
s'
commit
|
commitdiff
|
tree
2009-11-21
Raman Gupta
Add branch management for releases to g
i
tworkflows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
Thomas Ra
s
t
d
escribe: do not
u
s
e unannotated t
a
g
even if exact
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch a "us
e
b
e
fore assignme
n
t" warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-18
Junio C Hamano
M
e
rge
branch
'np/maint-sideband-favor-st
a
tus'
commit
|
commitdiff
|
tree
2009-11-18
Junio C H
a
m
a
no
Merge br
a
n
c
h 'sb/t
u
torial-test'
commit
|
commitdiff
|
tree
2009-11-18
Jun
i
o C Hamano
Merge bra
n
c
h 'ef/msys-imap'
commit
|
commitdiff
|
tree
2009-11-18
Stephen Boyd
ls-tree: migrate
t
o
parse-options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
J
unio C Haman
o
Mer
g
e git://git
.
b
og
o
m
ips
.
o
r
g
/git-sv
n
commit
|
commitdiff
|
tree
2009-11-17
Thomas Rast
reb
a
s
e
d
o
c
s: clarif
y
--merge and --strategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-17
Stephen B
o
yd
t3101:
t
est more ls-tree options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ham
a
n
o
Upd
a
t
e draft
r
elease not
e
s to 1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Junio C
Hamano
Sync with 1
.
6
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
J
unio C
H
amano
Gi
t
1
.
6
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Junio C Haman
o
Merge branch 'bs/m
a
int-pre-com
m
it-hook-sa
m
ple'
into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
aman
o
Merg
e
branch 'jk/ma
i
nt-add-p-emp
t
y'
into main
t
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hamano
Merge branch 'js/maint
-
diff-color-words' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Mer
g
e
branch 'tz/maint-r
p
m' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
amano
Merge br
a
nch
'
jk/maint-format-patch-p-suppress-stat
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
io C Hamano
Mer
g
e branch 'pb
/
maint-gitweb
-
blo
b
-lineno' into m
a
int
commit
|
commitdiff
|
tree
2009-11-16
Junio C Ha
m
ano
Me
r
ge
b
ranch 'j
k
/mai
n
t-1
.
6
.
3-ls-file
s
-i' int
o
mai
n
t
commit
|
commitdiff
|
tree
2009-11-16
Junio C
H
amano
M
er
g
e branch
'
vl/maint-openssl-signat
u
re-change' into
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
J
unio C
H
amano
M
e
rge branch 'jk/maint-push-config' into
m
aint
commit
|
commitdiff
|
tree
2009-11-16
Juni
o
C Hamano
M
er
g
e branch 'sr/blame-incomp
l
ete
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio
C
Hamano
Merge branch
'jc/maint
-
bl
a
n
k-at-eof'
i
nto
m
aint
commit
|
commitdiff
|
tree
2009-11-16
T
a
rmiga
n
Casebolt
http-back
e
nd: Let gc
c
che
c
k th
e
format of more printf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Tarmiga
n
Casebolt
h
t
tp-
b
acke
n
d
:
Fix
access
beyon
d
end o
f
string
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C Hamano
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Hamano
Merge branch 'bs/maint-pre-commit-
h
ook-s
a
mple'
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge bra
n
c
h 'js/m
a
int-diff-co
l
o
r
-words'
commit
|
commitdiff
|
tree
2009-11-16
Ju
n
i
o
C Hamano
Mer
g
e bra
n
ch 'rs/pretty
-
wrap'
commit
|
commitdiff
|
tree
2009-11-16
Junio
C Hamano
M
e
rge bran
c
h 'js
/
l
o
g
-r
e
wrap'
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge
b
ranch 'fc/
d
oc-fast-f
o
r
ward'
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hama
n
o
Merge
b
ranch 'sc/diffto
o
l-p4merge
'
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C Hamano
Merge branc
h
'jk/maint
-
add-p-emp
t
y'
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge
b
ranc
h
'l
t
/revis
i
o
n-bi
s
ect'
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o
C Ham
a
no
Mer
g
e branch 'jc/main
t
-1
.
6
.
3
-graft-trailing-space'
.
.
.
commit
|
commitdiff
|
tree
2009-11-16
J
u
nio C
Hamano
Merge
branch
'
t
r/ma
i
n
t-roff-quot
e
' into maint
commit
|
commitdiff
|
tree
2009-11-16
J
uni
o
C
H
amano
Merge br
a
nch '
j
a/fetch-doc
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
M
e
rge branch 'c
b
/doc-fetch
-
pull-
m
erge' into maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C H
a
mano
Merge branch 'jk/maint-cvsimport-pathna
m
e
'
into main
t
commit
|
commitdiff
|
tree
2009-11-16
Jun
i
o C Hamano
Merge branch
'
jc/receive-pa
c
k-auto' int
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merg
e
branch 'gb/maint-gi
t
web-esc-param'
in
t
o
maint
commit
|
commitdiff
|
tree
2009-11-16
Junio C Hamano
Merge branch 'jn/g
i
tweb-
p
atch' into
m
aint
commit
|
commitdiff
|
tree
2009-11-15
Thomas
R
ast
Docu
m
e
ntation:
clarify 'ours' me
r
ge strategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-15
Junio
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-15
J
u
lian
P
hillips
r
e
mot
e
: f
i
x
use-after-free error
d
e
tec
t
ed by g
l
i
bc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Todd
Z
ullinger
Makefile: Ensu
r
e rpm packages
can
be read by
older
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Björn Gustavsson
ba
s
h: add the merge option --ff
-
only
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Jakub
N
areb
s
ki
gitweb: Ma
k
e
'history' view (re)use git_log_generi
c
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
J
a
k
ub N
a
reb
s
k
i
gitweb
:
Refactor commo
n
p
a
r
ts
of
'
l
o
g' and 'shortlog
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Jakub Narebski
gitweb: Refactor 'log'
a
ctio
n
g
e
nerati
o
n
, adding git_log_body()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-14
Stephen Boyd
git-add
.
t
xt: fix fo
r
m
a
t
ting of
-
-patch section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
S
h
awn O
.
Pearce
http-backend: Fix bad treatme
n
t
of uintm
a
x_t in
C
onte
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Ni
c
olas P
i
tre
give pri
o
rit
y
to progress messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
J
unio
C
Haman
o
Provide a build time d
e
fault-page
r
settin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonat
h
a
n
N
iede
r
Pr
o
vide a build tim
e
def
a
ult-editor sett
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
J
o
nathan Nieder
am -i, git
-
s
v
n: use "git var GIT_PAGER"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
a
dd -i
,
send
-
email, svn, p
4
, etc: use
"
git
v
ar
GIT_ED
I
TOR"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Teach gi
t
var about GIT_PAGE
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Teach git var ab
o
ut GIT_E
D
ITOR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
J
o
n
a
t
han Nieder
Suppress w
a
rnings fro
m
"
g
i
t
var -l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Jonatha
n
N
ieder
Do
n
ot use VISU
A
L editor on
dumb te
r
minals
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Scott Cha
c
o
n
Update packfile transfe
r
protocol do
c
umentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
Th
o
mas Rast
filter-branch: nea
r
e
s
t
-
ancestor rewriting outsid
e
subdir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-13
T
h
omas
R
ast
filter-branch: stop sp
e
cial-casing $fi
l
ter_s
u
bdir a
r
gument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-11
Ju
n
io C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-11-11
Junio C Hamano
che
c
k
-
r
ef-format -h: it does not know th
e
--print option yet
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
Junio C Hamano
gi
t
-describe
.
txt: fo
r
ma
t
ting
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-10
J
unio
C
Hamano
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-11-10
Junio C Ha
m
a
no
Merge branch 'jk/main
t
-format-patch-p-suppress-stat'
commit
|
commitdiff
|
tree
2009-11-10
Junio C Hamano
Merge bran
c
h 'pb/maint-gitwe
b
-
blob-lin
e
no'
commit
|
commitdiff
|
tree
2009-11-10
Junio C Hamano
Me
r
ge branch 'tr/describe-
a
dvice'
commit
|
commitdiff
|
tree
2009-11-10
Jun
i
o C Ha
m
ano
Merge branch 'jk/maint-1
.
6
.
3-ls-files
-
i'
commit
|
commitdiff
|
tree
2009-11-10
Junio C Ha
m
ano
M
e
r
ge branch
'bg/
m
erge-ff-o
n
ly'
commit
|
commitdiff
|
tree
2009-11-10
Junio C Hamano
Mer
g
e branch
'
v
l
/maint-op
e
nssl-signatu
r
e-change'
commit
|
commitdiff
|
tree
2009-11-10
Junio C Hamano
Merge b
r
anch 'jk
/
m
aint-push-config'
commit
|
commitdiff
|
tree
2009-11-10
Ju
n
io
C Hamano
M
e
rge branch
'jk/gitignore-anc
h
ored'
commit
|
commitdiff
|
tree
2009-11-10
J
u
nio C Hamano
Merge
b
ranch 'jp/dirty-describe'
commit
|
commitdiff
|
tree
next