repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'da/mergetool-docs'
2013-02-07
Junio C Hama
n
o
Merge
b
ranch 'da/mergetool-docs'
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C Hamano
Mer
g
e
b
ranch 'ss/mergetools-
t
o
r
toise'
commit
|
commitdiff
|
tree
2013-02-07
Junio C H
a
mano
Mer
g
e branch 'jk/mergetool'
commit
|
commitdiff
|
tree
2013-02-07
Junio
C
H
aman
o
Merge bra
n
ch 'jk
/
doc-makefile-cl
e
anup'
commit
|
commitdiff
|
tree
2013-02-07
J
u
nio C H
a
mano
Merge branch 'jk/remote-helpers-doc'
commit
|
commitdiff
|
tree
2013-02-07
Junio
C Hamano
Merge bra
n
c
h
'
sb/run-c
o
mmand-fd-error-reporting'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Ham
a
no
Merge branch 'nd/br
a
nc
h
-error-cases'
commit
|
commitdiff
|
tree
2013-02-07
Junio
C
Ham
a
n
o
Merge branch 'sb/gp
g
-i1
8
n'
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merge branch
'
jk/python-sty
l
es'
commit
|
commitdiff
|
tree
2013-02-07
J
u
nio
C
Hamano
Merge
br
a
nch '
a
b/gitw
e
b-use-same-scheme'
commit
|
commitdiff
|
tree
2013-02-06
Junio C H
a
mano
Up
d
ate draft
r
e
l
ease
no
t
es
t
o
1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-06
Junio C Ha
m
ano
Merge branch 'jn/auto-d
e
pend-
w
o
r
karoun
d
-
b
u
ggy-cca
c
h
e'
commit
|
commitdiff
|
tree
2013-02-06
Junio C Hamano
Merge branch 'ta/
d
oc-no
-
small-caps'
commit
|
commitdiff
|
tree
2013-02-06
Junio
C
Ha
m
ano
Me
r
ge branc
h
'jc
/
fake-
a
ncestor-w
i
th
-
non-blob
s
'
commit
|
commitdiff
|
tree
2013-02-06
Junio C Haman
o
Merge
branch 'sb/gp
g
-plug-fd-lea
k
'
commit
|
commitdiff
|
tree
2013-02-06
Ju
n
io C Hamano
M
e
rge branch
'
ft/tran
s
port-repor
t
-seg
v
'
commit
|
commitdiff
|
tree
2013-02-04
Juni
o
C Hamano
Update
d
r
aft r
e
lease notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-04
Junio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2013-02-04
Junio
C
H
amano
Mer
g
e branch 'jk/
r
emote-helper
s
-in-pyt
h
on-3'
commit
|
commitdiff
|
tree
2013-02-04
Jun
i
o C Hama
n
o
M
erge branch
'
pw/git-p4
-
on-
c
ygwin'
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Me
r
ge br
a
nc
h
'jk/
r
ead-commit-buffer-
d
ata-after-free'
commit
|
commitdiff
|
tree
2013-02-04
Junio
C Hamano
M
erge branch
'
mm/add-u-A-san
s
-pa
t
hsp
e
c'
commit
|
commitdiff
|
tree
2013-02-04
J
unio C Haman
o
Me
r
g
e
branch 'jc/push-reject-reaso
n
s'
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
M
e
rge branch 'jk/con
f
ig-pa
r
sing-cleanup'
commit
|
commitdiff
|
tree
2013-02-04
Juni
o
C Hamano
Merge branc
h
'
jc/
c
ustom-
c
om
m
ent-char'
commit
|
commitdiff
|
tree
2013-02-04
J
u
nio C Ham
a
n
o
Start preparing f
o
r 1
.
8
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Mer
g
e branch 'bc/git-p4-for-python-2
.
4'
into maint
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merge br
a
n
ch 'nd/
e
dit-branch-d
e
sc-while-det
a
ched' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merge branch 'jn/do-not-d
r
op-use
r
name-when-reading
.
.
.
commit
|
commitdiff
|
tree
2013-02-04
J
unio
C
Hamano
Merge bran
c
h
'
jk/cvsimport
-
d
oes-not-
w
ork-wi
t
h
-c
v
sps3
.
.
.
commit
|
commitdiff
|
tree
2013-02-04
J
u
n
i
o C Ha
m
ano
M
erge br
a
nch 'dl/am-hg
-
lo
c
a
l
e'
into maint
commit
|
commitdiff
|
tree
2013-02-04
J
unio C Hamano
Merge
bra
n
c
h
'jc/
h
elp' i
n
to main
t
commit
|
commitdiff
|
tree
2013-02-04
Ju
n
io C Haman
o
M
e
rg
e
branch '
j
c/merge-blobs
'
into
m
aint
commit
|
commitdiff
|
tree
2013-02-04
Jun
i
o
C Hamano
Merge branch 'j
c
/doc-main
t
a
iner' into maint
commit
|
commitdiff
|
tree
2013-02-04
Junio C Hamano
Merge b
r
an
c
h
'
bc/fi
x
-array-sy
n
tax-fo
r
-3
.
0-in-compl
e
tion
.
.
.
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
doc: generate a list of va
l
id me
r
g
e too
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keepin
g
mergetool--lib: list use
r
config
u
red t
o
ols in '--tool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-03
David Aguilar
merg
e
tool--lib: add functions f
o
r
f
indi
n
g
ava
i
lable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-02
Jonathan Nieder
Makef
i
l
e: expli
c
i
tly set target name for
au
t
ogenerated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-02
Sven Strickro
t
h
mer
g
et
o
ols: teach tor
t
oisemerge to han
d
le filenames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Keeping
Rename {git- => git}remote-hel
p
ers
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Stephen B
o
yd
run-command: be more
inform
a
t
i
v
e
a
bout what f
a
iled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Thomas Ac
k
erm
a
nn
D
ocumentation: StGit is the right s
p
elling, not StGIT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio C Haman
o
Do
c
umentatio
n
: des
c
r
ibe the
"
r
e
posi
t
o
ry"
in repository
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Th
o
mas
Ackermann
D
o
cu
m
entation: add a description for 'gitf
i
l
e
' to gl
o
ssa
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Thomas Ackerm
a
nn
Documentat
i
on: do not
use undefined
t
erms gi
t
-dir
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Thomas Ackerm
a
nn
D
ocume
n
tation
:
the name
o
f
t
he sy
s
tem is 'Git
'
, not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Th
o
mas Ackerman
n
Docu
m
entation: av
o
id p
o
o
r
-man's small
caps G
I
T
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio C
Hamano
Update draft rel
e
ase
n
otes
t
o 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio C H
a
mano
M
erg
e
br
a
n
ch 'nd
/
edit-bra
n
ch-desc-whil
e
-de
t
ached'
commit
|
commitdiff
|
tree
2013-02-01
Ju
n
io C Hama
n
o
Merge
b
ranch 'jk/gc-auto
-
after-fetc
h
'
commit
|
commitdiff
|
tree
2013-02-01
Junio C H
a
mano
Merge branch 'b
c
/g
i
t-p4-for-python-2
.
4'
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
Merge b
r
a
n
ch
'
j
n
/do
-
not
-
drop-username-when-r
e
ading
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
Junio
C
Hama
n
o
Merge
branch 'j
k
/cvsimport-does-n
o
t
-work-with-cvsp
s
3
'
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hama
n
o
Merge
b
ranc
h
'jc/do-no
t
-
let-rand
o
m-
f
ile-
i
nterfere-wi
t
h
.
.
.
commit
|
commitdiff
|
tree
2013-02-01
J
u
n
i
o
C
Hamano
Merge b
r
anc
h
'as/
t
est-clean
u
p'
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
Merge b
r
anch 'jc/no-git-c
o
n
fi
g
-in-clone'
commit
|
commitdiff
|
tree
2013-02-01
Junio C
H
amano
Merge
b
r
anch 'n
d
/fetch-dep
t
h-is-broken'
commit
|
commitdiff
|
tree
2013-02-01
J
eff K
i
ng
Documen
t
ati
o
n
/Makefile: clean up
MAN*_TXT l
i
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio C Hamano
apply:
d
i
a
gnose incomplete submodule object
n
a
m
e
better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio C Ha
m
ano
apply: simplify build_fak
e
_ance
s
tor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Junio
C
Haman
o
git-am: record full
i
ndex l
i
ne in th
e
patch used while
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
Jeff
King
branch: l
e
t b
r
a
n
c
h
filters imply --list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-01
J
e
ff King
d
o
cs: clarify
g
it-branch --list be
h
avior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-31
Stephen Boyd
gpg:
close
s
tde
r
r once finished with it
in verify_signed_
b
uf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-31
Stephen Boyd
gp
g
: allow translat
i
on of more error mess
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-31
Fr
a
ser
T
weedale
push: fix segfault when
HEAD po
i
nts nowhere
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Junio C
H
a
mano
Mer
g
e git://ozlabs
.
org/~paulus/gi
t
k
commit
|
commitdiff
|
tree
2013-01-30
John Keep
i
n
g
CodingGuide
l
i
nes: add P
y
thon coding guideli
n
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
g
i
t_
r
emo
t
e_
h
elpers: remove GIT
-
P
YTHON-VERSI
O
N
u
pon
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
INSTAL
L
: git-p4 does
not sup
p
ort Python 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn T
h
ái Ngọc Duy
b
r
a
n
ch: mark more stri
n
g
s
f
o
r translation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Junio C
Hamano
M
e
rg
e
br
a
nch 'nd/
e
dit
-
branch-
d
esc-while-deta
c
hed' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn Thái Ngọc D
u
y
branch: give a more helpf
u
l messa
g
e
o
n
redunda
n
t
a
rguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Nguyễn Thái
Ng
ọ
c Du
y
b
ranch: reject -D/-d
wit
h
out br
a
nch nam
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Ng
u
yễn T
h
ái Ngọc Duy
branch: n
o
de
t
ached HEA
D
check when e
d
iting ano
t
her
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-30
Jun
i
o C Hama
n
o
M
e
rge bran
c
h 'rr/mini
m
al-stat'
commit
|
commitdiff
|
tree
2013-01-30
Ju
n
io C Hamano
Merge branch 'nd/magic
-
p
a
t
hspec-fr
o
m
-root'
commit
|
commitdiff
|
tree
2013-01-30
Junio
C
H
amano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2013-01-30
Junio C Hamano
Merge branch
'
tb/t0050-maint' into
maint
commit
|
commitdiff
|
tree
2013-01-29
Da
v
id Aguilar
mer
g
eto
o
l--lib: improve the h
e
lp t
e
xt
in guess_merg
e
_
t
ool()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
ergetool--lib: simplify command e
x
pressions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
Junio C Hamano
M
erge br
a
nch
'nd/fix-d
i
re
c
tory-
a
ttrs-
o
f
f
-by-one' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2013-01-29
J
u
n
io C Haman
o
Merge
b
ranch 'ph/re
b
ase-preserv
e
-all-
m
er
g
es' into
m
a
i
nt
commit
|
commitdiff
|
tree
2013-01-29
Junio C
Hamano
R
E
ADME:
u
pdat
e
stale and/or incorre
c
t inform
a
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
David
Ag
u
il
a
r
mergetools: simplify how we handle "vi
m
"
and "defaults"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-29
Andrej E Baranov
gitw
e
b: ref
e
r to
picon/gravatar ima
g
es over the sam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
Juni
o
C Hamano
Update draf
t
r
e
l
e
ase notes t
o
1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hama
n
o
Sync w
i
th 1
.
8
.
1
.
2
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io C H
a
mano
Git 1
.
8
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-28
J
u
nio C
H
a
mano
Me
r
ge branch
'
s
s/help-
h
t
m
lpath-conf
i
g-doc' i
n
to maint
commit
|
commitdiff
|
tree
2013-01-28
J
unio C Ham
a
no
Merge branch 'nd/attr-debug-fix' into maint
commit
|
commitdiff
|
tree
2013-01-28
J
unio C Hamano
M
e
rge
b
r
a
nch
'
ds
/
completio
n
-silence
-
in-tree-path
-
p
r
ob
e
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hama
n
o
Merge branch 'j
n
/main
t
-
trim-vi
m
-contrib' into maint
commit
|
commitdiff
|
tree
2013-01-28
Ju
n
io C Hamano
M
erge branch 'pe/d
o
c-email-e
n
v-is-t
r
um
p
ed-by-config
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
a
n
o
Merge branch
'mk/comp
l
ete-tcsh' into maint
commit
|
commitdiff
|
tree
2013-01-28
Junio C Hamano
Merge branch 'ap/
s
tat
u
s-ignored-in-ignored
-
direc
t
ory
.
.
.
commit
|
commitdiff
|
tree
2013-01-28
J
unio C Hamano
Merge branch 'e
r
/s
t
op-recomm
e
n
d
i
ng-parsecvs' into mai
n
t
commit
|
commitdiff
|
tree
2013-01-28
Junio C Ha
m
ano
Merge
branc
h
'
m
h/ceili
n
g' in
t
o maint
commit
|
commitdiff
|
tree
2013-01-28
Jun
i
o C Hamano
Merge
branch 'tb/t0050-m
a
int'
commit
|
commitdiff
|
tree
next