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
advice: Introduce error_resolve_conflict
2011-08-04
R
a
mk
u
m
a
r Ramac
h
andr
a
advice:
I
n
tr
o
duce erro
r
_
r
esolve_co
n
flict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-20
Junio C Hamano
Merge branch 'mk/grep-
p
cre'
commit
|
commitdiff
|
tree
2011-06-20
J
u
nio C
H
a
m
ano
t
78
1
0: avoid unportable
u
s
e of "echo"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-20
Jim Meyer
i
ng
plug a
f
ew coverity-spotted leak
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-19
Junio C
Haman
o
Merge bra
n
c
h 'di/no-no-existant'
commit
|
commitdiff
|
tree
2011-06-19
Juni
o
C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-06-19
A
ndreas Schwab
builtin/gc
.
c: add missin
g
new
l
i
n
e in m
e
ssage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-17
Jeff King
tests: lin
k
shell
l
i
brari
e
s
into valgrind
directo
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-17
Jeff King
t/Makefile: pa
s
s test opts to valgrind ta
r
get
properly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-17
Junio C Haman
o
Merge branch 'ab/i18n-scrip
t
s-basic'
commit
|
commitdiff
|
tree
2011-06-17
Brando
n
C
a
sey
sh-
i
18n--
e
n
vsubst
.
c: do not #include ge
t
opt
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-16
Dmit
r
y Ivankov
Fix typ
o
:
existant->existent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-16
Junio C
H
amano
G
i
t 1
.
7
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
J
onathan Nied
e
r
gitweb: do not misparse nonnumeric
c
onte
n
t tag file
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Junio
C
Ham
a
no
Git 1
.
7
.
6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Junio
C H
a
man
o
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2011-06-09
J
i
m Meyering
fetch: do not leak a re
f
spec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-07
Junio C
H
amano
Merge branch '
j
c/magic-pathspec'
commit
|
commitdiff
|
tree
2011-06-07
Alex Riesen
t3703: skip more tests usin
g
colons in file names
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-06
Juni
o
C
H
a
man
o
Merge branch 'j
n
/mi
m
e-type-with-params'
commit
|
commitdiff
|
tree
2011-06-06
Junio C Hama
n
o
Merge branch 'jn/gitweb
-
d
o
cs'
commit
|
commitdiff
|
tree
2011-06-06
Junio C Hamano
M
e
rge bran
c
h '
j
k/diff
-
not-so-quick
'
commit
|
commitdiff
|
tree
2011-06-06
Jun
i
o
C Hamano
M
e
rge
b
ranch 'bc/maint-status-z-to-use-porcelain'
commit
|
commitdiff
|
tree
2011-06-05
J
ak
u
b
Narebski
gitw
e
b: Fi
x
u
s
ability of $prevent_xss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-03
Jakub Na
r
ebski
gitweb: Move "Requ
i
remen
t
s
" up in gitweb/IN
S
T
ALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-02
Ja
k
ub Narebski
gitweb: Describe C
S
SMIN a
n
d J
S
MIN
in git
w
eb/INSTALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-02
Ja
k
ub Na
r
e
bski
gitw
e
b: Move information about
installat
i
o
n
from REA
D
ME
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
Hamano
S
y
nc with 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
G
i
t
1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o C Hamano
M
er
g
e
b
r
anc
h
'jk/maint-con
f
i
g-alias-fix' in
t
o maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C H
a
ma
n
o
Mer
g
e branch 'jc/fmt-req-f
i
x' into mai
n
t
commit
|
commitdiff
|
tree
2011-06-01
J
unio C Hamano
Merge br
a
nch 'jk/maint-docs' into maint
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
io
C Hamano
M
erge b
r
anch 'jn
/
doc-r
e
mote-helpers' into
maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ham
a
no
Me
r
ge bran
c
h 'kk/maint-prefix-in-confi
g
-mak'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-06-01
Jim
Meyering
diffcore-r
e
nam
e
.
c:
a
void set-but-not-u
s
ed
warn
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Update
draft
r
ele
a
s
e note
s
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge
b
ran
c
h 'jk/fo
r
mat-
p
atch-am'
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge bra
n
ch
'
jn/doc-re
m
ot
e
-
helpers'
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Me
r
ge branch 'jk
/
f
orm
a
t-p
a
tch-empty
-
pr
e
fix'
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C
Hamano
Merge branc
h
'ab/i1
8
n-envsubst-doc-fix'
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Ha
m
ano
Merge branch 'jc/log-quiet
-
f
i
x'
commit
|
commitdiff
|
tree
2011-05-31
Junio C H
a
ma
n
o
Merge b
r
anch 'kk/maint
-
prefix-in-config-mak'
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch
'
j
k
/reb
a
s
e
-hea
d
-reflog'
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge branch
'jk/mai
n
t-docs
'
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ham
a
n
o
Merge bran
c
h '
j
k/read-in-full-
s
tops-on-error'
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 'jk
/
maint-re
m
ote-mirror-safer'
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C
Hamano
Merge branch
'jl/re
a
d-tr
e
e-m-dry-ru
n
'
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Sy
n
c with maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
a
n
o
St
a
rt
1
.
7
.
5
.
4 draft release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge br
a
nch
'tr/add-i-n
o
-escape' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ham
a
n
o
Mer
g
e branch 'vh/confi
g
-interac
t
i
v
e-singlekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Haman
o
Merge bran
c
h 'ml/test-read
m
e' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branc
h
'a
b
/i18n-fixup
'
into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
a
no
Merge branch 'jc/rename-degrade-cc-to-c'
into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 'rr/do
c
-c
o
ntent-type' into maint
commit
|
commitdiff
|
tree
2011-05-31
Ramsay Jones
config
.
c
:
R
emove unused git_
c
onfig_global() f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
J
un
i
o
C Ha
m
ano
diff:
f
utu
r
ep
r
oof
"
stop f
e
e
d
ing the backe
n
d e
a
rly"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Jeff King
diff_tree: disable QUICK o
p
t
imization
w
ith d
i
ff fil
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C
H
amano
Me
r
ge branch 'jc/fmt-req
-
fix'
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Merge
branch
'jk/maint-con
f
ig-alias
-
f
i
x'
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nieder
Documentation: do not mis
i
nterpr
e
t ref
s
pecs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Je
f
f King
f
o
rma
t
-patch
:
make zero-
l
ength subject pr
e
fixes prettier
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Æ
v
a
r
Arnfjörð Bjarma
s
o
n
git-sh-i18n--
e
nvsubst: add SYNOPSIS section to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio C
H
amano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io C Ha
m
a
n
o
Merg
e
branch 'jm/mai
n
t-misc-fix' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'bc/maint-sub
m
odule-fix-par
k
ed' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Haman
o
M
erge
branch 'bc/maint-
a
pi-d
o
c-
p
a
r
ked' into maint
commit
|
commitdiff
|
tree
2011-05-30
J
unio C Hamano
Me
r
ge branc
h
'mk/grep-pcre'
commit
|
commitdiff
|
tree
2011-05-30
M
i
ch
a
ł Kiedrowic
z
git-gre
p
: Fix problems with recently
a
dded tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
H
a
m
a
no
Merge bra
n
ch
'jc/notes-batch-
r
emoval'
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'jk
/
haves-fr
o
m-alternate-odb'
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge
b
ranch 'jn/r
u
n
-
c
o
mman
d
-er
r
or-failure' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-29
Brando
n
C
as
e
y
bui
l
tin/c
o
mmi
t
.
c: set status_
f
or
m
at
_after_ option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-29
Brandon Case
y
t
7508: demonstrate statu
s
's failure to use
--porcelain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-28
Junio C Hamano
log: -
-
qui
e
t
s
hould
s
erve as
sy
n
onym to -s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
reba
s
e: wri
t
e a
refl
o
g entry
w
h
en fi
n
is
h
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
C
s
aba H
e
nk
rebase: create HEAD reflog entry wh
e
n aborting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
c
onfig
.
mak
.
in: allow "con
f
igure
-
-sysconfd
i
r=/else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs
:
fix some anti
q
u
e exampl
e
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs
:
make su
r
e
literal "-
>
" isn'
t
converted to ar
r
ow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f
Kin
g
docs: up
d
ate statu
s
-
-
p
o
rcelain
f
ormat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f King
docs: mino
r
gram
m
ar fixes
to git-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
e
f
f K
i
ng
forma
t
-p
a
tch: pr
e
s
erve su
b
ject
n
ewlines with -k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f
K
i
ng
cl
e
an
u
p
calling conventions for pretty
.
c f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
e
ff Ki
n
g
pretty:
a
d
d pp_comm
i
t_easy function for
s
imple callers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
git-sub
m
odule
.
sh
:
separ
a
t
e
par
e
ns by a
space t
o
avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brand
o
n Casey
D
ocum
e
ntation/technic
a
l/api-
d
if
f
.
txt: correct name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
mail
i
nfo: alwa
y
s clean up
r
fc822 header fold
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
eff King
t: test subject handling in
f
orm
a
t-patch / am
p
ipeline
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_in_full:
a
lway
s
rep
o
rt errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
eff King
rem
o
te: allow "-t"
w
ith fetch mirrors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_gitfile_gent
l
y:
u
se ssiz
e
_t to hold
read result
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim
M
eyering
remove tests of alway
s
-fals
e
condition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
plug
a DIR
b
uffer leak in rerere
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyerin
g
rerere
.
c: dia
g
n
o
se a corrup
t
MERGE_RR when hit
t
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Update 1
.
7
.
6
d
r
aft releas
e
n
o
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jn/
u
serdiff-perl
-
u
p
dates'
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Me
r
ge
branch 'rg/no
-
gec
o
s-in-pwent'
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/fetch
-
m
ark-complete-optimization'
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jn/gitw
e
b-js'
commit
|
commitdiff
|
tree
next