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
git-mergetool: add new merge tool TortoiseMerge
2009-04-08
M
a
rk
u
s Heidelberg
g
it-merg
e
tool:
add new merge tool To
r
toise
M
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Marku
s
Hei
d
elbe
r
g
g
i
t-mergetool
/
difft
o
ol: make (g)vimdiff wor
k
able unde
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
ar
k
us Heidelberg
do
c
/merge-c
o
n
fig
:
l
i
s
t
ecmerge as a built-in merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
atthieu Moy
git-rev-list
.
txt: make as
c
ii ma
r
kup un
i
fo
r
m
with o
t
he
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thieu Mo
y
git-send
-
e
m
ail
.
txt: cl
a
rify which option
s
take an a
r
gument
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio
C
Hamano
Merg
e
br
a
nch
'
jc/na
m
e
-branch'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merg
e
branch 'jc/shared-li
t
erally'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge bra
n
c
h '
m
g/tracked-local-branches
'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch 's
b
/fo
r
mat-
p
atch-patchname'
commit
|
commitdiff
|
tree
2009-04-06
Fe
l
ipe Contreras
user-manual: the name of the hash function
i
s
SHA-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
d
ocbook: chang
e
css style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
user
-
man
u
al: remove some git-foo us
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Santi B
é
j
ar
Documentation: branch
.
*
.
merge can also affect 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Vo
i
gt
Add configuration variabl
e
for
sign-off to format-
p
atch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd
Z
u
llinger
bash compl
e
tion
:
Up
d
ate 'git am' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjou
git submodule: fix u
s
age line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
unio C Haman
o
Merge
bra
n
ch 'maint-1
.
6
.
1' into m
a
int
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Marku
s
Heidelberg
doc/git-pack-r
e
fs
:
fix t
w
o grammar issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests: remo
v
e exit after
te
s
t_do
n
e call
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff Ki
n
g
c
o
m
mit: abort commit if i
n
t
eractive a
d
d failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
bisect: improve e
r
ror message when branch c
h
eckout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Dan
M
cGe
e
git
-
repack:
use non-dashed up
d
ate
-
serv
e
r-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay S
o
ffian
send-email:
f
ix nasty bug in ask() functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ha
m
ano
U
p
date
d
raft release notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Sync wi
t
h 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C
Hamano
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hamano
Merge branch 'jc/maint-1
.
6
.
0-blame-s'
into maint
commit
|
commitdiff
|
tree
2009-04-02
J
u
ni
o
C
Ha
m
ano
Me
r
ge branch 'js/maint-diff-temp-s
m
udge'
i
n
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
io C Hamano
M
erge bra
n
c
h
'js/maint-1
.
6
.
0-exec-path-env' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branc
h
'
b
c/maint
-
1
.
6
.
1
-
branch-deleted
-
was' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
H
amano
Merg
e
branch 'tr
/
maint-1
.
6
.
1-doc-format-patch--roo
t
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merg
e
bran
c
h 'dm/
m
aint-docco' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffi
a
n
send-em
a
il: ensure q
u
oted
a
ddresses are rfc2
0
47 encoded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Sof
f
ian
s
end-email:
correct two tests which
w
ere going
i
n
teractive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
Merg
e
branch
'
ef/fast-
e
x
p
o
r
t'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
rge br
a
nch 'm
h
/format-patch-add-header'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Merg
e
branch 'tr/maint-1
.
6
.
1-
d
oc-for
m
at-patch--r
o
ot'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C H
a
m
ano
Merge b
r
anch 'ma
i
nt-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
Merge br
a
nch 'maint
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C Haman
o
M
erge branch 'cj
/
doc-
f
o
r
ma
t
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
Merge branch 'jc/mai
n
t
-
1
.
6
.
0
-keep-pack'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Ha
m
a
no
Me
r
ge branch 'kb
/
tracking-count-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
We
s
le
y
J
.
Landa
k
er
D
ocumenta
t
i
on: git-svn: fix
t
r
u
nk/fetc
h
svn-remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Björn
S
tein
b
rink
M
a
i
lmap:
A
l
low empty email
a
ddres
s
es
to be mapped
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Mi
c
hae
l
J Gruber
Make
local b
r
anches
behave li
k
e r
e
mote b
r
anc
h
es when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Hei
k
o Voig
t
Clean
u
p warning about
k
n
own issues in
c
vsimport d
o
c
u
m
entatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Hol
g
er We
i
ß
Documentation
:
R
e
m
o
v
e a
n
odd "instea
d
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay
S
offian
s
e
nd-e
m
ail: as
k
_defau
l
t s
h
o
u
l
d
appl
y
to al
l
emai
l
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
ay
S
offi
a
n
send-email: d
o
n't atte
m
p
t to pr
o
mpt if tty is closed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t13
0
1: l
o
osen te
s
t
f
or forced mod
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portab
i
lity
problem
w
ith IS
_
R
UN_CO
M
MAND_
E
RR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Stephen
B
oyd
format_sani
t
ized_subjec
t
:
D
o
n't trim past i
n
itial length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Chris Johnsen
Doc
u
me
n
tati
o
n: use "spuri
o
us
.
s
p" XSLT if DO
C
BOO
K
_
S
UPP
R
ES
S
_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johannes Schindeli
n
mailmap: r
e
surrect
lower-casing
of ema
i
l addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jun
i
o
C
Ha
m
ano
Merge
g
it://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Rudi
b
u
i
l
tin-
c
l
o
ne
.
c: no need to strdup f
o
r
s
e
tenv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
A
li Gholami Rudi
builtin-c
l
o
n
e
.
c: make junk_pid st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Ha
m
a
n
o
M
e
r
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ham
a
no
Update dra
f
t release
not
e
s
to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio
C H
a
mano
Merge
b
ran
c
h 'main
t
-1
.
6
.
1' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o
C Hama
n
o
Merge br
a
n
c
h
'maint-1
.
6
.
0' into
mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi
Béjar
Do
c
umentat
i
on:
p
ush
.
d
e
faul
t
applies to all
r
emo
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
S
anti B
é
jar
Documentation: en
h
ance bra
n
ch
.
<name
>
.
{rem
o
t
e
,merge}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Da
n
ie
l
Cheng (aka
.
.
.
Fix
bas
h
c
ompletion
in path with spaces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bash co
m
pletion: only show 'log --m
e
r
g
e' if mer
g
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmich- Scho
t
.
.
.
gi
t
-t
a
g(1): add
h
int about com
m
it me
s
sages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Allan Caffee
Doc
u
m
e
ntation: update graph api example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merg
e
bran
c
h 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C
H
a
mano
Merge branch 'm
a
int-1
.
6
.
0
' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Ja
y
Soffian
s
en
d
-
e
mail:
a
dd
t
est
s
f
or refactored prompti
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffia
n
send-emai
l
: ref
a
ctor and e
n
sure
p
rompting do
e
sn't
loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Er
i
c Wong
git-svn:
fix ls-tree usage
with dash-pre
f
ixed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jo
h
a
nnes Schindelin
im
p
ort-zips: fix thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eri
k
Faye-Lund
builtin-fast-
e
xport
.
c:
handl
e
nested tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-L
u
nd
b
uiltin-fast-export
.
c:
fix crash on tagged trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Er
i
k F
a
ye-Lund
builtin-fast-export
.
c
: turn error into
w
arning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
rik Faye-Lund
tes
t
-
s
u
ite:
a
dding a test for fas
t
-e
x
port w
i
th
tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
H
a
m
ano
set_shared_perm(): s
o
metimes we know what
the final
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
move_temp_to_file()
:
do not f
o
rget to chmod() in
"
Coda
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
un
i
o C Hamano
Mer
g
e branch
'
m
aint'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Updat
e
dr
a
f
t rel
e
ase notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o C
Ham
a
no
Merge bran
c
h 'jc/maint-1
.
6
.
0-diff-b
o
rrow
-
caref
u
lly'
commit
|
commitdiff
|
tree
2009-03-28
J
unio C Hama
n
o
Merge branch
'js/r
e
mote-i
m
provements'
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
Me
r
g
e
br
a
nc
h
'jk/clo
n
e-po
s
t-c
h
eckout'
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io
C
Hamano
Merge branch 'm
a
int-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
test
-
lib: Clean up comments and
M
a
kefile
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Mich
a
el Hendricks
format-pat
c
h: add arbitrary email
h
e
ade
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herlan
d
Mo
v
e chmod(foo, 04
4
4
)
into move_temp_t
o
_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C
Hamano
"
c
o
r
e
.
sharedrepository = 0mode
"
s
h
o
uld set
,
not loosen
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Mi
c
hele
B
allabio
rebase: fix typo (force_re
b
as ->
force-rebas)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Christian Couder
log-tree: fi
x
patch
fil
e
name
c
omput
a
tion in "git forma
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Michael J Gruber
Test f
o
r local
b
r
a
nches bein
g
followed with --track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Rast
Documen
t
atio
n
: format-patch --root cla
r
ifica
t
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Junio
C Hamano
Merge br
a
nch
'
cj/doc-quiet' into cj/doc-format
commit
|
commitdiff
|
tree
2009-03-27
Chris Johnsen
Do
c
umen
t
ation:
opti
o
n to rend
e
r literal text
a
s bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
C
h
ris Johnsen
Documenta
t
i
on: asci
i
doc
.
conf: fix verse bloc
k
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next