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: teach -Xours/-Xtheirs to binary ll-merge driver
2012-09-09
Jun
i
o
C
Hamano
merge: te
a
ch -
X
ours/-X
t
heirs to binary ll-merg
e
driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
ni
o
C Hama
n
o
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C Hama
n
o
Sync with
1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
ano
Gi
t
1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
G
it 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonath
a
n
Nieder
bundle: remo
v
e str
a
y
single-quote
from
error m
e
ss
a
ge
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Mer
g
e bra
n
c
h
'm
a
int-
1
.
7
.
8' into maint
-
1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C Haman
o
Merge branch
'
jc/main
t
-
verify-
o
b
j
ects-remove-pessi
m
ism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C Ha
m
ano
Me
r
ge branch 'dw/git
w
eb-doc-grammo' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'tr/cache-tree' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Hamano
Merg
e
branch 'c
b
/
maint-t5541-m
a
ke-server-port-portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C
Hamano
Mer
g
e branch 'cn/maint-rev-list-doc'
i
nto main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C Hamano
Me
r
ge br
a
nch '
t
r/ma
i
nt-bundle-bou
n
d
ary' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Me
r
g
e
b
ran
c
h 'tr/maint
-
bundle-l
o
ng-subject'
in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Hamano
Merge branch 'ph/re
r
e
re-doc' into
m
a
in
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio
C
Hamano
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Ham
a
no
Mer
g
e branch
'
jc/maint-mer
g
e-autoe
d
it' in
t
o
maint
commit
|
commitdiff
|
tree
2012-03-30
Heiko Voigt
s
t
ring-list: document
t
hat s
t
ring_
l
ist_insert() in
s
erts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Hamano
G
it
1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Merge br
a
nch 'jn/m
a
int-fast-import-empty-ls' into maint
commit
|
commitdiff
|
tree
2012-03-26
J
u
n
io C Hamano
M
erge br
a
nch 'ph/rer
e
re-doc' into maint
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
Merge
branch
'ms/main
t
-config-er
r
or-at-eol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mar
k
Lodat
o
grep doc: a
d
d --break / --heading
/ -W to synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Silva (Me
s
tr
.
.
.
Do
c
umentatio
n
: improve descripti
o
n
of GIT_E
D
IT
O
R
an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nelso
n
Benite
z
Leon
docume
n
tation: fix alphabetic order
e
d list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D Waitzma
n
Documenta
t
ion/gitw
e
b: triv
i
al English fixes
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C
Hamano
M
erge branch 'maint-1
.
7
.
8' into maint
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C Hamano
m
erg
e
: backport GIT_MERGE_AUTOED
I
T
support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C H
a
man
o
Merg
e
branch 'ks/sort-wildcard-in-makefile' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
M
e
rge bra
n
ch 'jc/advi
s
e
-
i1
8
n' int
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
H
a
mano
M
e
rg
e
branch 'jn/gitweb-unspec
i
f
ied-
a
cti
o
n
'
into main
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C Haman
o
fetch
/
rece
i
ve: remove over-pessimistic connectivit
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io
C Ha
m
ano
Git
1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
M
er
g
e br
a
nch 'tr/maint
-
bundle-boundary'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branch '
j
c/maint-dif
f
-patch-heade
r
' into
maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
M
er
g
e branch 'jn/maint-do-not-match-
w
it
h
-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ham
a
no
Merge
b
ranch 'j
c
/am-
3
-
nonstandard-
p
opt' in
t
o maint
commit
|
commitdiff
|
tree
2012-03-12
M
a
rt
i
n Stenberg
config: r
e
port errors
a
t the EOL wit
h
correct lin
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil Hord
rerere: Docume
n
t '
r
erere rem
a
ining'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Jakub Narebski
gitweb: Fix fixed string (non-re
g
exp)
p
ro
j
e
c
t
search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Thomas Rast
t5704: fix nonpo
r
table sed/grep usag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Junio C Hamano
Merge branc
h
'ma
i
nt-1
.
7
.
8' into
m
ain
t
commit
|
commitdiff
|
tree
2012-03-06
Junio
C Haman
o
M
erge branch 'ma
i
nt-1
.
7
.
7'
int
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Thomas Rast
Docume
n
t
t
he --
h
istogram diff op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
unio C H
a
ma
n
o
G
i
t 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Haman
o
Merg
e
branch 'jc/doc-merge-options' into maint
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C Hamano
Merg
e
branch 'cn/
m
ai
n
t-rev-list-d
o
c' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-05
T
homas Rast
fast-import: zero
a
ll o
f
'
struct t
a
g'
t
o silence valgrind
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C
Hamano
Up
d
at
e
dr
a
ft
r
ele
a
s
e
notes to 1
.
7
.
9
.
3 f
o
r the l
a
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio C Ham
a
no
M
e
rg
e
branch 'cn
/
maint-br
a
nch
-
with-bad'
i
n
to maint
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C Hamano
Merge branc
h
'jn/maint-gi
t
web-invalid-r
e
g
exp' into
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hamano
Merge bran
c
h 'nd/ma
i
nt-ver
i
fy
-
objects' into m
a
int
commit
|
commitdiff
|
tree
2012-03-05
Junio C Haman
o
Merge br
a
n
ch 'jk/maint-a
v
oid-stre
a
m
i
ng-filt
e
red-co
n
t
ents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio
C Hamano
Me
r
ge branch 'jb/filter-ignore-sigpipe' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2012-03-05
J
u
n
i
o C Ham
a
n
o
Mer
g
e branch 'sp/smart-http-fa
i
lure-
t
o
-
push
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-03-05
Junio C H
a
mano
Merge branch 'tr/maint-b
u
nd
l
e-lo
n
g
-subject'
i
nt
o
main
t
commit
|
commitdiff
|
tree
2012-03-05
Clemens Buch
a
cher
http
.
proxy: also me
n
tion https_proxy and a
l
l_proxy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Michael J
G
r
u
ber
t0300:
wo
r
k around b
u
g in dash 0
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
T
o
m
Gr
e
nnan
t
5512
(ls-remo
t
e)
:
m
o
d
e
r
nize sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
St
e
f
ano
L
a
tt
a
rini
tests: fix spurious
e
rror
w
hen run directly w
i
th Sol
a
ri
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
Junio
C
Hamano
Documentatio
n
: do not assu
m
e that n
>
1
in
<r
e
v>~$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thom
a
s
R
ast
bun
d
le: keep around n
a
mes passed to add_pen
d
ing_object
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
T
h
oma
s
Rast
t
5510: ensure we
s
tay in the
t
oplev
e
l test di
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas Rast
t5510: re
f
act
o
r bundle->pack conversion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Juni
o
C Hamano
d
iff -p: squelch "
d
iff --git
"
h
e
ader
f
or st
a
t-dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
J
uni
o
C
Ham
a
no
t4011: illust
r
ate "d
i
ff-ind
e
x -
p
"
on stat-d
i
rty
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Ju
n
io
C
Hamano
t4011: modernise s
t
y
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
L
i
bor Pechacek
Document
a
t
i
on fixes in git-c
o
nf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Carlos Martín Nieto
D
o
cu
m
en
t
ation: use {asterisk} in re
v
-list-options
.
t
x
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Jaku
b
Narebski
gitweb: Handle invalid regexp in re
g
exp search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn T
h
ái Ngọc Duy
rev-list: fi
x
-
-
verify-
o
b
j
ects --quiet
b
e
c
om
i
ng --ob
j
ects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn
T
hái N
g
ọc D
u
y
rev-list: r
e
m
ov
e
B
ISECT_
S
HOW
_
TRIED
fl
a
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Up
d
a
t
e draft release notes to 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Ham
a
no
Merge b
r
anch 'pj/remote-set
-
branches-u
s
ag
e
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Ha
m
a
no
M
e
rge bran
c
h 'jn/git
w
e
b
-
unborn-head' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Merge b
r
anch 'j
n
/ancient-meld-supp
o
rt'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o
C Ha
m
a
n
o
Merge b
r
anch 'tr/merg
e
-ed
i
t-guida
n
c
e' in
t
o maint
commit
|
commitdiff
|
tree
2012-02-27
T
im Henigan
Cod
i
n
g
Guidelines
:
do not use
'
which' in s
h
ell
scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Tim Henigan
CodingGuidel
i
nes:
A
d
d a note about
s
p
a
ces after redirection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Carlos M
a
rtín Niet
o
branch
:
don't
a
ss
u
me th
e
m
erge filter ref exists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
M
i
c
ha
e
l
Haggerty
post-receive
-
email: mat
c
h up $LOGBEGIN
.
.
$LOGEND pairs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Mi
c
hael Hagge
r
ty
post-receive
-
email: remov
e
unused va
r
i
a
bl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
test:
"am -3" c
a
n accept non-sta
n
dar
d
-p<
n
um>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Ham
a
no
Docum
e
nt accumu
l
ated fix
e
s since 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Haman
o
Merge
br
a
nch 'jc/
a
d
d
-
r
ef
r
esh-
u
nmerged' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
Merge br
a
nch 'js/configure-libintl' into maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio C Hamano
Sync
wit
h
1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C Ham
a
no
Git 1
.
7
.
8
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michał Kied
r
owicz
grep
-
P: Fix matching ^ and $
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
im Meyering
am: don't infloop for an
empty
inp
u
t
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Andre
w
Wong
rebase -m: only cal
l
"no
t
es copy"
when rewritten exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
P
ete Wyc
k
of
f
git-p4: remove bash-
i
s
m
in t9800
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
P
ete W
y
c
k
off
gi
t
-p4: re
m
ove bash-ism in t9809
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckoff
g
i
t-p4: fix submi
t
regre
s
sion
w
i
t
h c
l
ient
S
pec
an
d
subdir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete W
y
ckoff
git-p4:
s
et us
e
ClientSpec
v
a
r
i
able on
i
ni
t
ial clone
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-26
Dm
i
t
r
y V
.
Levin
Makefile:
add thread-
u
tils
.
h
t
o LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Jeff King
do not
s
tream l
a
rge files t
o
p
ack when f
i
lters are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Jeff
K
ing
teach
dry
-
run convert_to_git no
t
to require
a
src buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Je
f
f King
teach co
n
vert_to_
g
it
a "dr
y
run
"
mod
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next