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
advice: Introduce error_resolve_conflict
2011-08-04
Ramku
m
ar
R
amach
a
ndra
a
d
vice: Introduce error_resolve_conflict
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
Junio
C
Ham
a
no
t781
0
: a
v
oid un
p
ortable
use of "echo"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-20
Jim Meye
r
ing
plug a
f
ew coverity-spotted leaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-19
J
u
nio C Hamano
M
e
rg
e
branch 'di/n
o
-
no-exis
t
an
t
'
commit
|
commitdiff
|
tree
2011-06-19
Junio C Hamano
Merge br
a
n
c
h 'main
t
'
commit
|
commitdiff
|
tree
2011-06-19
Andr
e
as Schwab
builti
n
/gc
.
c: add missing newlin
e
in messag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-17
Jeff King
t
e
sts: link shell libr
a
ries int
o
valgri
n
d directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-17
Jeff King
t
/Makefile:
p
a
s
s test opts to valgrind targ
e
t properl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-17
Ju
n
io C H
a
mano
Mer
g
e
b
ranch 'a
b
/i18n-scripts-b
a
sic'
commit
|
commitdiff
|
tree
2011-06-17
Brandon Casey
sh-i18n--en
v
s
ubst
.
c: do not
#
includ
e
getopt
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-16
Dmitr
y
Ivan
k
ov
Fix typo: existant
-
>exi
s
ten
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-16
Junio
C H
a
m
a
no
Git 1
.
7
.
6-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
Jonathan Nieder
g
i
tweb
:
do not misparse nonnume
r
ic content
t
ag files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
J
u
ni
o
C Hamano
G
i
t
1
.
7
.
6-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyerin
g
fetch: do not leak a refspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-07
Junio C H
a
m
a
n
o
Merge branch
'
j
c
/magic-path
s
pec'
commit
|
commitdiff
|
tree
2011-06-07
Alex
R
iesen
t
3703: skip
m
ore test
s
using col
o
ns in f
i
le
n
ames
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-06
Junio C H
a
mano
Merge branch
'
jn/mime
-
t
ype-with-
p
arams
'
commit
|
commitdiff
|
tree
2011-06-06
Ju
n
io C
H
aman
o
Merge branch 'jn/gitw
e
b-docs'
commit
|
commitdiff
|
tree
2011-06-06
Jun
i
o
C Hama
n
o
Merge branch 'jk
/
diff-not-so-quick'
commit
|
commitdiff
|
tree
2011-06-06
Junio C Hama
n
o
Merge branch 'bc/ma
i
nt-status-z-to-use-porcelain
'
commit
|
commitdiff
|
tree
2011-06-05
Jakub Narebski
gitweb
:
Fix
u
sabi
l
i
t
y
of
$
pre
v
e
n
t_
x
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-03
Jaku
b
Narebski
gitweb: Mo
v
e
"Requirem
e
n
ts" up
i
n gitweb/INSTALL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-02
Jakub Narebs
k
i
gitweb:
D
escribe CSS
M
I
N and JS
M
IN in
git
w
eb/INS
T
ALL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-02
J
a
kub N
a
rebs
k
i
gitweb:
Mov
e
information about inst
a
llation from README
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ham
a
no
S
ync
w
ith
1
.
7
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o
C Ham
a
no
Git 1
.
7
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Junio C
H
aman
o
Merge branch 'jk/mai
n
t-confi
g
-
a
lias-fix' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Me
r
g
e branch 'jc/
f
mt-req-fix' into m
a
int
commit
|
commitdiff
|
tree
2011-06-01
J
u
nio C Hamano
M
e
rge branch 'jk/main
t
-docs' in
t
o maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
Merge branch 'jn/doc-re
m
ote
-
h
e
l
pers' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C H
a
mano
Merge branch
'
kk/m
a
in
t
-pre
f
i
x
-in-config-mak'
i
nto maint
commit
|
commitdiff
|
tree
2011-06-01
J
i
m
Meyering
diffc
o
re-rename
.
c:
a
v
oid se
t
-
but-no
t
-used
w
a
rning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hama
n
o
Upda
t
e
draf
t
rel
e
ase no
t
es to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
amano
Merge br
a
nch 'jk/format-p
a
t
ch-
a
m'
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C H
a
ma
n
o
Merge branch
'jn/do
c
-remote-helpe
r
s'
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merg
e
branch
'
jk/format-
p
atc
h
-
e
mpty-prefix'
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C
Ha
m
ano
Merge branch 'a
b
/i18n-envsubst-doc-fix'
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hamano
Merge br
a
n
c
h 'jc/lo
g
-qui
e
t-fix'
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Hamano
Merg
e
branc
h
'kk/maint-
p
re
f
ix
-
in-config-m
a
k'
commit
|
commitdiff
|
tree
2011-05-31
J
unio
C Ham
a
no
Me
r
ge
b
ranch
'
jk/r
e
base-
h
ead-reflog
'
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Ha
m
a
n
o
Merge branch 'jk/
m
a
i
n
t-docs'
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
amano
Merge branch 'jk/read-in-full-stop
s
-on-error'
commit
|
commitdiff
|
tree
2011-05-31
Junio C H
a
mano
Me
r
ge branch 'jk/maint-remote-
m
irro
r
-safer'
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Me
r
ge branch 'jl/
r
ead-
t
ree-m-dry-
r
un'
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
i
o
C Hamano
Sy
n
c with maint
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Ham
a
no
Start 1
.
7
.
5
.
4
d
r
a
ft release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Me
r
ge branch 'tr/add-
i
-no-escape' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
i
o
C Ha
m
ano
Merge
b
r
a
nch 'vh/config-interactive-
s
inglekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
H
amano
Merge b
r
a
nch 'ml/test
-
readme' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hama
n
o
M
erge b
r
anch 'ab/i18n-f
i
xup'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge bra
n
ch 'jc/rename-degrade-cc-to-c
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge bra
n
c
h 'rr/doc-co
n
te
n
t-type' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-31
Ra
m
say Jones
co
n
fig
.
c: Remove
unus
e
d git
_
config_global(
)
f
unction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C Haman
o
diff: futureproof "stop feeding
t
h
e
b
a
ckend early"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Jeff King
d
iff_tree: disable QUI
C
K optimiza
t
i
o
n
w
ith diff filt
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
ano
Merge branch 'jc/f
m
t-req-f
i
x'
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Hamano
Mer
g
e
branc
h
'jk/maint
-
c
o
nfig-alias-fix'
commit
|
commitdiff
|
tree
2011-05-30
Jon
a
t
han Nieder
Documentatio
n
: do not mis
i
nterpret refspecs as bold
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Jeff King
form
a
t
-
p
atch: make z
e
ro-lengt
h
subject prefixe
s
prettier
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Ævar Arnfjör
ð
B
jarm
a
son
g
i
t
-sh
-
i18n--envsubst: add
S
YNOPSIS s
e
c
tion to
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
J
u
n
i
o C
H
amano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-30
J
u
nio C Hamano
M
e
rge branch 'jm/main
t
-m
i
sc
-
fix' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ham
a
no
Merge b
r
anch
'
bc/maint-sub
m
odule-fix-parked' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ha
m
an
o
Merg
e
branch 'bc/maint-
a
p
i
-
d
o
c
-parked' into maint
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C
Ham
a
no
Merge branch 'mk/grep-pcr
e
'
commit
|
commitdiff
|
tree
2011-05-30
Michał Kiedrowicz
git-grep: Fix p
r
o
b
l
e
m
s
wi
t
h
recentl
y
added tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Haman
o
M
e
r
g
e
b
r
a
n
ch
'jc/not
e
s-batch-rem
o
val
'
commit
|
commitdiff
|
tree
2011-05-30
Junio C
Ham
a
no
M
e
rge bran
c
h 'jk/h
a
ves
-
from-a
l
ter
n
ate-odb'
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io C Hamano
Merge branch 'jn/ru
n
-command-e
r
ror
-
fai
l
ure' into
m
aint
commit
|
commitdiff
|
tree
2011-05-29
Bra
n
don Casey
b
u
iltin/commit
.
c
:
set
s
tatus_form
a
t _aft
e
r_
o
ption
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-29
Brandon Ca
s
ey
t7508: demonstrat
e
status's failure
to use
-
-p
o
rcelain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-28
Junio C Hama
n
o
l
og: --qu
i
et sh
o
uld serve as synonym to -s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
Kin
g
r
ebase: write a
r
e
flo
g
e
ntry
w
hen finishing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Csaba Henk
rebase: create HEAD
reflog entry when a
b
orting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Junio
C Ham
a
no
c
on
f
ig
.
mak
.
in: allow "configure --sysconfdir
=
/e
l
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
docs: fi
x
some ant
i
que exa
m
p
l
e output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
K
i
ng
docs: make sure
literal "->"
i
sn
'
t converted
t
o
arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff Ki
n
g
doc
s
:
u
pd
a
te status --porc
e
l
a
i
n
format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Kin
g
d
ocs: m
i
nor grammar fixes to gi
t
-
s
t
atu
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f
Ki
n
g
format-patch: preserve subject newlines
w
ith -k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff K
i
ng
c
l
ean up calling conventions for pretty
.
c f
u
nctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f King
pretty: add pp_commit_e
a
sy
f
un
c
tion fo
r
simple callers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brando
n
Casey
git-
s
ub
m
odule
.
sh: separat
e
p
a
r
ens by a space to
a
void
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
Doc
u
me
n
t
a
tion/technical/api-diff
.
txt: correct name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
mail
i
nfo:
alw
a
ys clean
up
r
fc82
2
h
eader folding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
t: tes
t
subje
c
t h
a
n
dling in for
m
at-patch /
am
p
i
p
e
l
in
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f
King
read_in_full:
a
lways r
e
port e
r
rors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
eff Ki
n
g
re
m
o
te:
allow "-t" with fetch
m
irrors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
r
ead_gi
t
f
i
le_gen
t
ly: use ss
i
ze_t to
h
old r
e
ad
result
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meye
r
ing
remove tests
of
alway
s
-
f
a
l
se
condition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
p
lug
a DIR buffer lea
k
in rerere
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
rerere
.
c: d
i
agnose a corrupt ME
R
GE
_
RR whe
n
h
itt
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
Hamano
Update 1
.
7
.
6 draft rel
e
ase not
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
uni
o
C Hamano
Merge bran
c
h 'jn/userdiff-perl-updates'
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merge branch '
r
g
/
no-gecos-in-p
w
ent'
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
M
erg
e
b
r
anch 'jk/fetch-mark-complete-
o
ptimizati
o
n
'
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merg
e
bran
c
h
'jn/gitweb-js
'
commit
|
commitdiff
|
tree
next