repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-one-file: force content conflict for "both sides added" case
2013-02-14
Junio C Hama
n
o
Update draft release
notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hamano
Merge branch
'
jk/di
f
f-graph-cleanup'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hama
n
o
Merge branch 'nd/status-show-in-pro
g
ress'
commit
|
commitdiff
|
tree
2013-02-14
Jun
i
o C Hamano
Merg
e
bran
c
h
'mm
/
remote-media
w
i
k
i-build'
commit
|
commitdiff
|
tree
2013-02-14
Junio C Hama
n
o
Merge branch 'b
w
/
g
et-tz-o
f
fset-perl'
commit
|
commitdiff
|
tree
2013-02-14
Jun
i
o C Hamano
Merge bran
c
h 'al/merge
t
o
o
l-printf-fix
'
commit
|
commitdiff
|
tree
2013-02-14
Junio
C Ha
m
ano
Merge
b
r
anch 'jk/e
r
r
o
r
-
c
onst
-
return'
commit
|
commitdiff
|
tree
2013-02-14
Jun
i
o C H
a
m
ano
Me
r
ge
b
ran
c
h 'j
x
/utf8-p
r
intf-width'
commit
|
commitdiff
|
tree
2013-02-14
Junio C
H
amano
M
erge br
a
nch 'mg/bisect
-
doc
'
commit
|
commitdiff
|
tree
2013-02-14
J
unio C Ham
a
n
o
Mer
g
e
branch 'tz/perl
-
styles'
commit
|
commitdiff
|
tree
2013-02-14
Junio C H
a
mano
Me
r
ge branch 'jc/ex
t
ended-f
a
ke-anc
e
stor-
f
or-gitlink'
commit
|
commitdiff
|
tree
2013-02-14
Junio
C Hama
n
o
Merge branch 'dg
/
subtree-f
i
xes'
commit
|
commitdiff
|
tree
2013-02-13
Martin Erik Werner
t990
3
:
add
extr
a
te
s
ts fo
r
b
a
s
h
.
sho
w
Dir
t
yState
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-13
Mart
i
n Erik Werner
t9903: ad
d
t
e
sts f
o
r bash
.
s
h
o
wUntrackedFil
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-13
M
att Kraai
Makefile
:
don
'
t ru
n
"
r
m" with
o
ut
a
ny files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-13
Martin Er
i
k We
r
ne
r
shell
p
r
ompt: add b
a
sh
.
showUntracke
d
File
s
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
rebase
-
i
: resp
e
ct core
.
c
o
mment
c
har
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Ke
e
pin
g
combine-diff
.
c: teach combined d
i
f
f
s about
l
ine prefi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff
.
c: use diff_l
i
ne_prefix() where a
p
pli
c
a
b
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff: add diff_l
i
ne
_
prefix fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff
.
c: make c
o
nst
a
nt string arguments con
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
di
f
f: write prefix to t
h
e correct
f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
Matt
h
i
e
u
Moy
completion: sup
p
ort 'git confi
g
--local'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
Ma
t
th
i
eu Moy
R
eplace
filepat
t
e
r
n with
p
athspec for
c
onsist
e
n
cy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Erik Fay
e
-Lund
parse-options: report u
n
c
o
rrupted multi-byte option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Matt Kraai
Allow bui
l
ding with xmlpar
s
e
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Jeff King
log: r
e
-
enco
d
e
com
m
it me
s
sages bef
o
r
e
grepping
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Jia
n
g Xin
Add
u
tf
8
_fprintf helpe
r
that returns corre
c
t
n
umber
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Micha
e
l J Gruber
g
i
t
-
bisect
.
t
x
t: clarify that
r
eset quit
s
bisect
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
J
unio C Hamano
Update
draft release notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Junio
C
H
amano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2013-02-11
W
.
Trevor King
u
se
r
-manual:
R
ewrite git-gc
secti
o
n for automa
t
ic
p
acking
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Trevor
K
ing
user-man
u
al: Fix 'you - Git' -> 'you
-
-Git'
t
ypo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Trevor King
u
ser-manu
a
l:
Fix 'http'
->
'
HTTP' typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Jun
i
o C
H
amano
Merge branch
'
s
p/smart-http
-
con
t
ent-type-check'
commit
|
commitdiff
|
tree
2013-02-10
W
.
Trevor King
user-manu
a
l: Fix 'b
o
th: so'
-
> 'both
;
so' typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-10
Davi
d
Aguilar
p4merge: fix printf u
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-10
David
A
guilar
difftool--helper: fix
p
rintf usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
Ben
Walton
cvsimport:
f
ormat commit
t
imestamp ourse
l
ves w
i
thout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
Ben Walton
perl
/
Git
.
pm: fix get_tz_o
f
fset to p
r
o
p
erly
handle DST
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
B
e
n Walton
Move Git::SVN::get_tz
t
o
G
it:
:
get_
t
z_of
f
s
et
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
Junio C Hamano
Merg
e
bran
c
h 'ma
s
ter'
o
f git://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2013-02-08
Ju
n
io C
H
a
m
ano
Merge branch 'jc/combin
e
-
d
iff-many
-
paren
t
s'
commit
|
commitdiff
|
tree
2013-02-08
Junio
C
Haman
o
Me
r
ge branch 'jk/apply-s
i
mila
r
itly-parsing'
commit
|
commitdiff
|
tree
2013-02-08
J
unio C Hamano
Merge br
a
nch 'mk/
t
csh-complete-only
-
k
n
o
wn-paths'
commit
|
commitdiff
|
tree
2013-02-08
J
u
n
i
o
C Ha
m
ano
Merge branch 'mp
/
complete-p
a
t
h
s'
commit
|
commitdiff
|
tree
2013-02-08
Junio C Hamano
Merge branch 'ct/autoconf-h
t
ml
d
ir'
commit
|
commitdiff
|
tree
2013-02-08
Ash
e
esh Laroi
a
gi
t
-mergetool: pr
i
nt
f
il
e
name
w
hen
i
t
co
n
tains %
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-08
M
a
tthieu
M
oy
git-r
e
mote-m
e
diawiki
:
u
se t
o
plevel's Make
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-08
Mat
t
hieu Moy
Ma
k
efile: m
a
ke sc
r
ipt-related rules usable
from su
b
dire
c
tories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-08
Matt Kraai
Use
__VA_ARGS__
for all of e
r
ror's arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-07
Junio C H
a
mano
Update draft
rele
a
se notes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-07
Junio
C Hamano
Sync wit
h
1
.
8
.
1
.
3
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Git 1
.
8
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-07
Junio
C
Hamano
Merge b
r
anch 'mz/pick-unborn' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C Hamano
Merge branch
'
n
d/fix-p
e
rf-parameters-in-tests' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio
C H
a
mano
Merge branch 'jc/do-not-
l
et-random-fil
e
-in
t
erfere-wi
t
h
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C H
a
mano
Merge bra
n
ch 'ft/transport-rep
o
rt-segv' into maint
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merg
e
b
ranch
's
b
/gpg-plug-fd-leak'
i
nto maint
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C Haman
o
Merge branch 'jc/fake-ancest
o
r-with
-
non-blo
b
s' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio C
H
a
mano
Merge bran
c
h 'jn/
a
uto-depend-w
o
rkaro
u
nd-b
u
ggy-ccache
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio C
Hama
n
o
Merge br
a
nch 'da/m
e
rget
o
o
l
-
d
o
cs'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hama
n
o
Mer
g
e br
a
nch 'ss/merge
t
ools-tort
o
i
se'
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C Hamano
M
e
rge branch 'jk/mergetool'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Ham
a
no
Merge branch 'jk/doc-
m
akefile
-
c
leanup'
commit
|
commitdiff
|
tree
2013-02-07
Junio
C
Hamano
M
erge branc
h
'jk/remote-helpers-do
c
'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
M
e
rge
b
r
a
n
ch 's
b
/run-c
o
m
mand-fd-error-reporting'
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C Hamano
Merge bra
n
ch 'nd/branch-e
r
r
o
r-cas
e
s'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Mer
g
e
b
r
anch 'sb
/
gpg-i18n'
commit
|
commitdiff
|
tree
2013-02-07
Junio
C
Hamano
M
erge bran
c
h 'jk/python-st
y
l
e
s'
commit
|
commitdiff
|
tree
2013-02-07
J
u
nio
C
Ham
a
no
Merge branch 'ab/gitweb-use
-
s
ame-scheme'
commit
|
commitdiff
|
tree
2013-02-07
J
uni
o
C Hamano
u
p
l
oad/rec
e
ive-
p
ack: allow hiding ref h
i
erarchi
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
gra
p
h: o
u
tput padding for merge sub
s
equent p
a
rents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-06
Ted Zlatanov
Up
d
ate C
o
dingGuid
e
lines for Perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-06
Jeff King
h
tt
p
_request: reset
"
typ
e
" strbuf
before
addi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-06
Junio
C Hamano
Up
d
ate draft release
n
otes to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-06
Junio C Hamano
Merge
b
ranch '
j
n/auto-depend
-
w
o
rkar
o
und-buggy-cc
a
che'
commit
|
commitdiff
|
tree
2013-02-06
Junio C Ha
m
ano
M
e
rge
branch 'ta/doc-n
o
-
s
m
all-caps'
commit
|
commitdiff
|
tree
2013-02-06
Junio C
Hamano
Merge
b
ranch
'
j
c/fake-
a
n
c
e
s
tor-with-non-blobs'
commit
|
commitdiff
|
tree
2013-02-06
Ju
n
io C Ha
m
ano
Merge
br
a
nch 'sb
/
gpg-pl
u
g-fd-lea
k
'
commit
|
commitdiff
|
tree
2013-02-06
Junio C
H
ama
n
o
Merge
branch
'ft/transport-report
-
segv'
commit
|
commitdiff
|
tree
2013-02-05
Jesper L
.
Nie
l
s
e
n
c
ontrib/subtree: make the
m
a
n
ual directory
if neede
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
Adam Tka
c
c
ontrib/subtree: hono
r
DES
T
DIR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
David A
.
Greene
c
o
ntrib/subtree
:
f
ix
s
ynops
i
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
Davi
d
A
.
Greene
contrib/sub
t
ree: b
e
tter error handling f
o
r '
s
ubt
r
ee
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
T
e
c
h
live Zh
e
ng
c
o
ntrib/subtr
e
e
:
use %B
f
or spli
t
subject/body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
David A
.
Gre
e
ne
cont
r
ib
/
subtree
:
remove
t
e
s
t
number co
m
ments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
John Ke
e
ping
t4038: add
t
ests fo
r
"diff --cc --raw
<t
r
e
e
s>"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
Junio C Hamano
apply: verify submodule com
m
it object name better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
Nguyễn
T
h
á
i Ngọc Duy
status: show the b
r
anch name if
possible in in-pr
o
gress
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-05
Junio C Hamano
t5551:
f
ix expected error o
u
tp
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-04
Junio
C
Hamano
Update dra
f
t release notes
to 1
.
8
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-04
Junio C H
a
m
a
n
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2013-02-04
Junio C Haman
o
Me
r
ge branch
'jk/
r
emote
-
helpers-in-python-3'
commit
|
commitdiff
|
tree
2013-02-04
J
unio C Hamano
Merge branch
'
pw/g
i
t-p4-on
-
cygw
i
n'
commit
|
commitdiff
|
tree
2013-02-04
Junio
C Hamano
M
e
r
ge bran
c
h 'jk/read-commit-
b
u
f
fer-da
t
a-after-free'
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merge bran
c
h 'mm/add-u-A-sans-pat
h
sp
e
c'
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merge b
r
anch '
j
c/push-reject-re
a
sons'
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merg
e
branch 'jk/config-parsing-
c
leanu
p
'
commit
|
commitdiff
|
tree
next