repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool/mergetool: refactor commands to use git-mergetool--lib
2009-04-08
David Aguilar
di
f
f
t
ool/me
r
ge
t
ool:
r
e
f
actor commands
to us
e
g
it-
m
ergetool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
m
erge
t
ool: use $(
.
.
.
)
instead of `bac
k
ticks`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
bash
c
o
mpletion: add git-diffto
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
diffto
o
l: add support for a dif
f
tool
.
p
rompt config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool:
add various git-
d
i
f
ft
o
ol te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguila
r
difftool: mo
v
e
'git
-
d
i
fftool' out
o
f
contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
S
e
bastian P
i
pping
di
f
ftool/mergetool: a
d
d di
f
fuse a
s
merge and diff tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
guilar
d
i
fftool: add a -y shortcut for --n
o
-
prompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
f
t
ool: us
e
p
erl bui
l
t-ins whe
n
testing for msys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
d
i
fftool: remove t
h
e backup
file featur
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
dif
f
tool: remove merge options for ope
n
diff, tkd
i
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
arkus Heidelberg
git-m
e
rgeto
o
l
:
add new
merge t
o
ol
T
o
rtoiseMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Ma
r
kus
Heidelberg
git-merge
t
ool/difftool: make (g)vimd
i
ff workab
l
e under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
arkus Heidelberg
doc/merge
-
config: li
s
t e
c
merge as a built-in merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
atthieu
M
o
y
g
i
t-rev-list
.
tx
t
: m
a
ke ascii mark
u
p
u
niform with o
t
h
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
i
t-
s
end-
e
mail
.
txt: c
l
arif
y
which options
t
ake an argum
e
n
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge bra
n
ch 'jc/n
a
me-b
r
anch'
commit
|
commitdiff
|
tree
2009-04-06
Junio C
H
amano
Merge branch 'jc
/
s
h
ared-literally'
commit
|
commitdiff
|
tree
2009-04-06
J
u
nio
C Hamano
Merge br
a
n
c
h
'mg/tracked-local
-
branches'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hama
n
o
Mer
g
e branch
'sb/format-pa
t
c
h-patc
h
name'
commit
|
commitdiff
|
tree
2009-04-06
F
e
li
p
e Contr
e
ras
user-
m
anual: the name of the hash
f
u
nction
i
s SHA
-
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felip
e
Contreras
doc
b
ook: change
c
ss style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felip
e
Co
n
treras
user
-
manual:
r
e
move some
git-
f
o
o us
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béjar
Documenta
t
ion:
b
r
anch
.
*
.
merge can also af
f
ect 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voigt
Add
c
o
nfigur
a
tion variable for sign-off to format-p
a
t
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd
Zu
l
linger
bash
c
omp
l
eti
o
n: Update
'
g
it am' o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merg
e
b
r
a
n
c
h 'maint
'
commit
|
commitdiff
|
tree
2009-04-05
Julien Dan
j
ou
git subm
o
dule
:
fix usage li
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hama
n
o
Merge branch '
m
ain
t
-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-05
Juni
o
C
Ham
a
n
o
Merge branch 'maint-1
.
6
.
0'
i
nt
o
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heide
l
berg
doc/git-pack-refs: fix two gr
a
mmar issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
t
e
sts:
r
em
o
ve exit after test_
d
one call
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: abort com
m
it
i
f i
n
t
e
r
a
c
tive a
d
d fai
l
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christ
i
an
C
ouder
bisect: improve erro
r
m
e
s
sage
when branch checko
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Dan
M
c
G
ee
git-repack: use
n
on-
d
a
s
hed upd
a
t
e-server-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soff
i
an
se
n
d-email: fix nasty b
u
g in a
s
k() function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Ham
a
no
Update dra
f
t release notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
Sync with 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ham
a
no
G
I
T 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
io
C
Hama
n
o
Merge
branc
h
'jc/maint-1
.
6
.
0
-
blame-s' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Merge bran
c
h '
j
s/maint-
d
iff-temp-smudge' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio
C Hamano
Me
r
ge b
r
anch 'js/
m
aint-1
.
6
.
0
-
exec-path-env' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hamano
M
erge
branch
'
bc/maint-1
.
6
.
1
-
branch-
d
eleted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erge branch
'
tr/maint-1
.
6
.
1-doc-f
o
r
mat-pat
c
h--
r
oot
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erge branch 'd
m
/maint-docco
'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffi
a
n
se
n
d-email: ensur
e
quoted add
r
esses ar
e
rfc2047 encoded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay
Soffian
sen
d
-
email: c
o
rrect two tests which we
r
e
g
oi
n
g interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
br
a
nch 'ef/fast
-
export'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
amano
Merge
br
a
n
c
h 'mh/format-patch-add-h
e
ader'
commit
|
commitdiff
|
tree
2009-04-02
J
unio
C
H
a
mano
Merge branch 'tr/maint
-
1
.
6
.
1
-d
o
c
-format-patc
h
--root
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hamano
Mer
g
e branch 'main
t
-1
.
6
.
1
' into
maint
commit
|
commitdiff
|
tree
2009-04-02
J
unio
C
Hamano
Merge bran
c
h '
m
aint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C H
a
mano
Merge
b
ranch 'cj/doc-format'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Merge branch 'j
c
/maint-1
.
6
.
0-keep-
p
ack'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
M
e
rge branch 'kb/tracking-count-no-merge
s
'
commit
|
commitdiff
|
tree
2009-04-02
Wesley
J
.
Land
a
k
e
r
Do
c
umenta
t
ion
:
git-svn
:
fix trunk/fetch svn-remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
B
j
ör
n
Steinbrink
Ma
i
lmap:
A
l
low
empty email addre
s
ses to
b
e map
p
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Mic
h
ael J Gruber
Make local branches behave li
k
e
r
e
mote branch
e
s when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
He
i
ko Voigt
Cleanup warning about known
issues i
n
c
v
simport document
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Holger We
i
ß
Documen
t
ation
:
Remo
v
e
a
n od
d
"
inst
e
ad"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-ema
i
l: ask_defau
l
t s
h
ould
a
pp
l
y
t
o
all emai
l
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffia
n
send-email: don't attempt to prompt if tty is
c
l
o
s
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jef
f
King
t
13
0
1: loo
s
e
n
test for forced modes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
f
ix
po
r
tability problem wi
t
h IS_RUN_C
O
MMAND_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
S
t
e
p
hen Boyd
format_sanitized_subject:
Don't
t
r
i
m past initi
a
l
l
ength
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Chri
s
J
ohnsen
Documenta
t
ion: use "spurious
.
sp" XSLT if
D
OCBOOK_SUPPRE
S
S_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
ohannes Schindelin
mailmap: resurrect lower-
c
asing of email addresse
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Junio C Hamano
M
e
r
g
e git://git
.
b
o
gomips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami
R
udi
builtin
-
clone
.
c
: no need
to st
r
dup f
o
r
s
e
tenv
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Rud
i
bu
i
lti
n
-clone
.
c
:
make j
u
nk_pid st
a
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C
Ha
m
ano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Update
draft release
notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio C
Hamano
Merge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Merge branch 'maint-1
.
6
.
0
' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
S
a
n
t
i Béj
a
r
D
o
cumentation: p
u
sh
.
de
f
ault
app
l
i
es to all remot
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Sant
i
B
é
ja
r
D
ocumentation
:
enhance branch
.
<n
a
me>
.
{
remote,merge}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
D
aniel Ch
e
n
g
(
a
k
a
.
.
.
Fix ba
s
h co
m
pletion in pat
h
w
ith spaces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
T
homas Rast
bash completi
o
n: onl
y
show 'log -
-
merge'
if merging
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
N
ico
-telm
i
c
h- Schot
.
.
.
gi
t
-tag(1): add hint about com
m
it messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
A
l
lan Ca
f
fee
Documentation: update graph api e
x
ample
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hama
n
o
Merge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
M
e
r
ge
branc
h
'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Hamano
Merg
e
bra
n
ch 'maint-1
.
6
.
0' into main
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Ja
y
Soffian
send-email:
a
dd tests for ref
a
c
tore
d
prompting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffia
n
s
e
nd-email: refactor a
n
d ensure
promp
t
i
n
g doesn't lo
o
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eric Won
g
git-svn: fix ls
-
tre
e
usage with
das
h
-prefixed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
o
hannes
S
c
hindelin
import-zips: fix thinko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eri
k
Fa
y
e
-Lund
builtin
-
f
a
st-export
.
c: han
d
l
e
nested tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-L
u
n
d
builtin
-
fast-ex
p
ort
.
c: fix crash on tagged trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
builtin-
f
ast-
e
xpo
r
t
.
c: tur
n
e
r
ror into war
n
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik
F
aye-Lund
test-suite: a
d
ding
a
test f
o
r fa
s
t-export with tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io C Haman
o
set_sha
r
e
d_
p
erm(): sometimes we know what
t
h
e
final
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
m
o
ve_temp_to_
f
il
e
(): do not forget t
o
chmod() in
"
C
o
da
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hama
n
o
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C
Hama
n
o
Update draft release notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o C Hamano
Merge branch '
j
c/maint-1
.
6
.
0-diff-borrow-c
a
r
efully'
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
M
e
rge
b
ranch 'j
s
/remote
-
improvements
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge
branch 'j
k
/clo
n
e-po
s
t
-checkou
t
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C
H
amano
Merg
e
bran
c
h 'm
a
i
nt-1
.
6
.
1' into
m
a
i
n
t
commit
|
commitdiff
|
tree
next