repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
ll-merge: warn about inability to merge binary files only when we can't
2012-09-12
Junio C Hamano
ll-merge: warn about
i
n
ability to merge binar
y
f
iles
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
J
unio C Hamano
attr: "binar
y
"
attribute shou
l
d choose built-in "
b
inary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
J
u
nio C Hamano
merge: tea
c
h -Xo
u
rs/-X
t
heirs to binary ll
-
merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C
Ha
m
ano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
unio C
H
amano
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonatha
n
Nieder
bundle: remove stray single-quo
t
e from error message
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Juni
o
C Hamano
M
e
rge br
a
nch '
m
aint-1
.
7
.
8
'
into m
a
in
t
-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merg
e
bran
c
h 'jc/maint-verify
-
obje
c
ts-re
m
ove
-
pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Haman
o
Me
r
g
e
branch 'd
w
/gitweb
-
do
c
-gr
a
m
mo' in
t
o
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
Me
r
ge branch 'tr/cache-tree' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C
H
amano
Merge branch 'cb/mai
n
t-t
5
5
41-make-server-port-
p
o
r
table
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hama
n
o
Merge branc
h
'cn/maint-rev-lis
t
-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io
C Ham
a
no
M
erge branch '
t
r/maint-bundl
e
-
b
ou
n
dary
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
am
a
n
o
Merge branch 'tr/ma
i
n
t-bundle-
l
ong
-
s
u
bject' int
o
mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge bran
c
h 'p
h
/rerer
e
-do
c
'
i
nto main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-02
Junio
C
Ham
a
n
o
Git
1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
J
unio C Hamano
Merge br
a
nch 'jc/maint-merge-autoedit' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-30
H
e
iko Voigt
string-list: document that string_list_insert() insert
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C
H
amano
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Merge bra
n
c
h
'j
n
/maint-
f
ast-i
m
p
ort-
e
m
p
ty-ls
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-26
J
unio
C
Hamano
Merge branch '
p
h/r
e
rere-doc' into m
a
int
commit
|
commitdiff
|
tree
2012-03-26
Junio
C Ha
m
ano
Merg
e
branch 'ms/maint-con
f
i
g
-error-at-eol-l
i
n
ecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lodato
g
rep
doc: add
-
-
bre
a
k / --he
a
ding / -W to
s
ynops
i
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo
S
ilva (Mestr
.
.
.
Documentation: i
m
pr
o
ve d
e
sc
r
i
p
tion of GIT_EDITOR and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nelson Ben
i
tez L
e
on
documentat
i
on: fix al
p
ha
b
etic ordered lis
t
fo
r
gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D Waitzman
Documen
t
a
t
ion/gitweb: trivi
a
l English fixes
commit
|
commitdiff
|
tree
2012-03-20
J
unio
C
Ham
a
no
Merge b
r
anch 'maint-1
.
7
.
8' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-20
Junio
C Hamano
merge: backpo
r
t GIT_ME
R
GE_AUTOEDIT suppor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
J
unio C Ha
m
ano
Merge br
a
nch 'ks/sort-wildcard-in-m
a
kefile
'
into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Haman
o
Merge branc
h
'jc
/
advise-i18n'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C
H
a
mano
Merge bra
n
ch 'jn/gitweb-unspe
c
ified-action' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-15
Junio C
Hamano
fetch/rec
e
ive:
r
emove ove
r
-pessim
i
st
i
c connectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hamano
G
i
t 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Mer
g
e branch 'tr/main
t
-
bundle-bounda
r
y' into m
a
in
t
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hamano
Merg
e
b
r
anch 'jc/ma
i
nt-diff-patch-header' into maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io C
H
amano
Merge
branch 'jn/maint-do-not-
m
atch-
w
ith-
u
nsan
i
tized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge
b
r
a
nch 'jc/am-3-nonstand
a
rd-popt' into maint
commit
|
commitdiff
|
tree
2012-03-12
Marti
n
Stenberg
config
:
repo
r
t errors at the EOL with c
o
rrec
t
l
ine
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Ph
i
l Hord
rerere
:
D
o
cume
n
t 'rerere rema
i
ning'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
Jakub Narebski
gitweb: Fix fixed st
r
i
ng (non-re
g
e
xp) pro
j
ec
t
search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
T
h
o
m
a
s Rast
t5704: fix
nonportable sed/grep
u
sag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-06
J
u
nio C Hamano
Merg
e
branch 'maint-1
.
7
.
8'
into mai
n
t
commit
|
commitdiff
|
tree
2012-03-06
Ju
n
i
o C Hamano
M
erge
bra
n
ch 'maint-1
.
7
.
7'
i
nt
o
m
a
int-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-06
Tho
m
a
s Ra
s
t
Document
t
h
e -
-
histogram diff option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Junio
C
H
amano
Git 1
.
7
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
i
o
C Hamano
Merge bran
c
h 'jc/doc-me
r
ge
-
options'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-05
J
unio
C Hamano
M
e
r
ge
b
ranch 'cn/mai
n
t-rev
-
l
i
s
t-doc' into m
a
int
commit
|
commitdiff
|
tree
2012-03-05
Th
o
ma
s
Rast
fast
-
i
mport: zero all of 'struct tag' to silence valgrind
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
J
u
nio C H
a
ma
n
o
Update draft relea
s
e
notes
t
o
1
.
7
.
9
.
3
for t
h
e last
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C Hamano
Merge branch
'cn/maint-branch-with-b
a
d' into
m
aint
commit
|
commitdiff
|
tree
2012-03-05
Ju
n
i
o C Hama
n
o
Merge b
r
a
nch '
j
n/m
a
int
-
gitweb-
i
nvalid-re
g
exp'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Jun
i
o C
Ha
m
a
n
o
Merge branch 'nd/ma
i
nt-verify-
o
bjects' in
t
o
maint
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge
b
r
a
nc
h
'jk/
m
aint-avoid-streaming-filt
e
r
e
d-con
t
ents
.
.
.
commit
|
commitdiff
|
tree
2012-03-05
Junio C Hamano
Merge branch 'jb/filter-ignore-sigp
i
p
e' in
t
o
m
aint
commit
|
commitdiff
|
tree
2012-03-05
Junio C
Ham
a
n
o
Merge branch 'sp/smart-h
t
tp-
f
ailu
r
e-to-p
u
sh' into maint
commit
|
commitdiff
|
tree
2012-03-05
Juni
o
C Hamano
Merge b
r
anch 'tr/m
a
int-bundle-long-subject' into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-05
Clemens Buchacher
http
.
proxy: also mention http
s
_proxy
a
nd all_proxy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
Micha
e
l J Gruber
t0300: wo
r
k
a
r
ound bug in dash 0
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-03
T
o
m
Gren
n
an
t5512 (ls-remote): m
o
dernize s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
Stefano L
a
t
tarini
tests: fix s
p
urious e
r
ror w
h
en run directly w
i
th So
l
ar
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-02
Junio C Hamano
Documentation:
d
o not assume
that n >
1
i
n
<rev>
~
$n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thom
a
s
Rast
bu
n
dle: keep
a
rou
n
d names passed
t
o
add_pending_objec
t
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
T
h
o
m
a
s Rast
t5510
:
ensure we s
t
ay in the toplevel test
dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Thomas
Ras
t
t
5
510: ref
a
ctor bundle->pack convers
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio
C
H
a
m
ano
diff -p:
s
quelch "d
i
ff
--git" he
a
der for s
t
at-dirt
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4
0
11:
i
l
lustr
a
t
e
"d
i
ff-index
-
p"
on
s
tat
-
dir
t
y paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Junio C Hamano
t4
0
11: m
o
der
n
ise st
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-01
Libor Pechac
e
k
Docum
e
ntatio
n
fixes in git-config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Carlos
M
artín Nieto
Documenta
t
io
n
: use {asterisk} in r
e
v-li
s
t-option
s
.
txt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Jakub Narebsk
i
gitweb
:
Handl
e
invalid reg
e
xp in regexp search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Ng
u
yễn T
h
ái Ngọc
D
uy
rev-list
:
fix --verify-
o
bjects --q
u
iet bec
o
ming -
-
objec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-28
Nguyễn Thá
i
Ngọ
c
Duy
rev-
l
ist: r
e
move
BISECT_SHOW_TRIED flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
Up
d
ate d
r
aft
r
elease not
e
s 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 bran
c
h 'pj/remote-set-branches
-
u
s
age
-
fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-02-27
J
u
n
io C Hamano
M
e
rge branc
h
'jn/gitweb-unborn-he
a
d' into
mai
n
t
commit
|
commitdiff
|
tree
2012-02-27
Junio
C Hamano
Merge branch
'jn/ancient
-
meld-
s
upport' into mai
n
t
commit
|
commitdiff
|
tree
2012-02-27
Ju
n
io C H
a
mano
Me
r
ge
b
ranch
'
tr/merge-edit-guidance'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-02-27
Tim He
n
ig
a
n
Codi
n
gGuid
e
li
n
es:
do not use
'w
h
ich' i
n
shell script
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Tim
H
e
nigan
C
od
i
ngGuide
l
ines: Add a note about spaces af
t
er redirection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Carl
o
s Martín Nieto
branch
:
don
'
t assume the merge
filter ref exists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
M
ichael
Haggerty
post
-
receive-email: m
a
tch up $
L
O
G
B
EG
I
N
.
.
$
L
OGEND pairs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Michael Haggerty
post-receive-email: remove unused
v
ariab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
Hamano
test: "am
-
3" can
accep
t
non-
s
tandard -p<num>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Jun
i
o C Hamano
Docu
m
ent accu
m
ulated fi
x
es since 1
.
7
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Junio
C
H
amano
Me
r
ge branch 'jc/add
-
refresh-u
n
me
r
ged
'
into maint
commit
|
commitdiff
|
tree
2012-02-27
J
u
nio
C Hamano
M
erge bran
c
h 'js/configu
r
e
-
l
ibintl' in
t
o
m
aint
commit
|
commitdiff
|
tree
2012-02-27
Junio C Ha
m
ano
Sync
w
i
t
h 1
.
7
.
8
.
5
commit
|
commitdiff
|
tree
2012-02-27
Junio C Hamano
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 mat
c
hing
^ and $
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
J
i
m Meyerin
g
am: don't
in
f
l
o
op for an
e
mpty input fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Andre
w
Wong
rebase -m: only cal
l
"notes copy" wh
e
n rewritten exists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete Wyckof
f
git-p4
:
remove bash-ism
i
n t9800
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pete
W
yckoff
git-p4: r
e
m
ove bash-ism in t9
8
09
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
P
ete
W
yckoff
git-
p
4: fix submit regres
s
ion
w
it
h
clientSpec and
s
u
b
dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-27
Pet
e
Wy
c
koff
git-p4: set us
e
ClientSpe
c
variab
l
e on initial
c
l
one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-26
Dmitry V
.
L
e
vin
Ma
k
efile
:
add thr
e
ad-uti
l
s
.
h to LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-02-24
Jeff King
do not strea
m
large f
i
les
to
pack w
h
en filte
r
s
ar
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next