repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: add support for a difftool.prompt config variable
2009-04-08
David Aguilar
difftool: add supp
o
rt
f
or a difftoo
l
.
p
r
ompt config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
diffto
o
l: add various
g
it-diffto
o
l tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguil
a
r
di
f
ftool: move 'git-difftool' out of contrib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Sebastian P
i
p
p
ing
d
ifftool/
m
er
g
etool: add diffuse
a
s merge
a
n
d
di
f
f tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: ad
d
a
-
y shortcut f
o
r
-
-n
o
-p
r
ompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agui
l
ar
difftool: use perl built-ins when tes
t
ing for msys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
difftool: remove the bac
k
up file
feature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
diff
t
ool:
remove
m
erge optio
n
s
f
or
opendiff
,
tk
d
i
f
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Ma
r
kus Heidel
b
e
rg
g
it-me
r
getool: ad
d
ne
w
merge tool
TortoiseMerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
r
k
us Heidelberg
git-mergetool/diffto
o
l
:
mak
e
(g)
v
imdiff workable u
n
d
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus He
i
delbe
r
g
doc/merge-config: lis
t
ecmerge as a
built-in merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thi
e
u Moy
git-rev-list
.
txt: ma
k
e ascii markup
uniform with ot
h
er
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu Moy
git-send-email
.
txt: clarify
which opt
i
ons
take an
ar
g
ument
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge br
a
nch 'jc/name-branch'
commit
|
commitdiff
|
tree
2009-04-06
J
u
nio
C Haman
o
Merge branch 'jc/shared-li
t
erally'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merg
e
branch 'mg/tracked-
l
ocal-bra
n
ches'
commit
|
commitdiff
|
tree
2009-04-06
Jun
i
o C Hamano
Merge branch 'sb/format-patc
h
-p
a
tchname'
commit
|
commitdiff
|
tree
2009-04-06
Fel
i
pe
C
ontreras
user-ma
n
ual: the nam
e
of the
hash function is SHA-1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contrer
a
s
docbook:
c
hange css
s
tyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
F
e
l
ipe Contreras
user-manual: r
e
move
s
ome git-foo
usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béjar
Docu
m
entation
:
b
ranch
.
*
.
merge can also affect 'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Hei
k
o
Voigt
Add
conf
i
guration variable for sign-off
t
o format-pat
c
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zullinger
bash c
o
mple
t
ion: Update 'git am' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Haman
o
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjou
git submodule: fix usage line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ha
m
a
no
Me
r
ge
branch
'
maint-1
.
6
.
1'
i
nto
main
t
commit
|
commitdiff
|
tree
2009-04-05
Juni
o
C
H
amano
Mer
g
e branch
'
maint-
1
.
6
.
0' into
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelberg
doc/git-pa
c
k-ref
s
: fi
x
tw
o
g
r
am
m
ar issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Je
f
f
K
ing
te
s
ts: remove
ex
i
t aft
e
r test_done call
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
e
ff King
commit: abo
r
t
c
ommit
if interact
i
ve
add f
a
iled
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Chr
i
stian
C
ouder
bi
s
ect: improve error message when branc
h
checkout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Dan McGee
gi
t
-repac
k
: us
e
non
-
dashed upd
a
t
e-server-i
n
fo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
send-emai
l
:
f
ix
nasty
b
ug in a
s
k() func
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Update d
r
a
f
t release
not
e
s to
1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
Sync with 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
GIT 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Merge b
r
a
nch 'jc/main
t
-1
.
6
.
0
-blame-s' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'js/maint-diff-t
e
mp-
s
mud
g
e
'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'js/maint-1
.
6
.
0-exec-path-env'
into maint
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
io C Ham
a
no
Merg
e
branch 'bc
/
main
t
-1
.
6
.
1
-
branch
-
deleted
-
was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge bran
c
h
'
t
r
/m
a
in
t
-1
.
6
.
1-d
o
c-f
o
rmat-pa
t
c
h
--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o
C
Hamano
Merge b
r
a
nch
'd
m
/maint-docco' into ma
i
n
t
commit
|
commitdiff
|
tree
2009-04-02
Ja
y
Sof
f
ian
send-email
:
ensure
q
uoted addresses are
r
fc
2
0
47 en
c
od
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Jay Sof
f
ian
send-email:
c
orrect
t
wo te
s
ts whi
c
h were
g
oing in
t
e
r
active
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C
Hamano
Mer
g
e
b
ra
n
ch 'e
f
/fast-exp
o
r
t'
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
io C
H
a
mano
Merge bran
c
h 'mh/f
o
r
mat-patch-add-header'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'tr/maint-1
.
6
.
1-do
c
-format-patc
h
--ro
o
t'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ha
m
ano
M
erge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Hamano
Merge
b
r
a
nch 'm
a
int-1
.
6
.
1' into m
a
i
n
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
a
n
o
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge branc
h
'cj/doc-forma
t
'
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hamano
Merge branch 'jc/maint-1
.
6
.
0-kee
p
-pack'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
b
ranch 'kb/tracking-count-
n
o-merges'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
Landake
r
Do
c
u
m
e
ntation:
g
it-svn: fix
t
run
k
/fetch svn
-
r
emot
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Björn S
t
einbrink
M
a
i
l
m
ap: Allow
e
mpty ema
i
l a
d
d
r
esses to be mappe
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Michael J Gruber
M
ake local b
r
anches
b
e
have
like remote bran
c
h
e
s when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Heik
o
Voigt
C
l
e
a
nup warning
a
bo
u
t k
n
own issues
in c
v
simport documenta
t
io
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
H
o
l
ger Weiß
Documen
t
at
i
on:
R
e
m
o
ve a
n
odd "i
n
stead"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
J
ay
S
o
f
fian
send-
e
mail: ask_
d
efault s
h
ould
a
pply to all emails
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay
Soffian
send-
e
mail: don't
attempt to
p
rompt
i
f
tty is closed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jef
f
King
t1301: loosen te
s
t for forced modes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Je
f
f King
fix port
a
b
i
l
ity
p
r
oblem with IS_RUN
_
C
O
MMAND_ERR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Stephen
B
o
yd
form
a
t_sanitiz
e
d_
s
ubject:
D
on't trim past initi
a
l
l
eng
t
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Chris Jo
h
nse
n
Documentation: use
"
spurious
.
sp" XSLT if DOCBOO
K
_SUPP
R
ES
S
_S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Joha
n
nes
Schind
e
lin
mailmap: r
e
surr
e
ct low
e
r-casi
n
g of email addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Juni
o
C Hamano
Mer
g
e git://
g
i
t
.
bogomips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2009-04-01
A
li Gholami Rudi
builti
n
-clone
.
c: no need
t
o strdup for s
e
tenv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
A
l
i Gholami Rudi
builti
n
-clone
.
c: mak
e
junk_pid static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ham
a
n
o
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio
C
Hamano
Update draft release
n
o
tes to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Ju
n
io C Hamano
M
e
rge branch 'ma
i
n
t
-1
.
6
.
1
'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ha
m
ano
Merge branch 'maint-1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi B
é
jar
D
ocu
m
entation: pu
s
h
.
de
f
ault applies to all remotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Sa
n
t
i
Béjar
Documentation: enhance
branch
.
<name>
.
{remo
t
e,
m
e
r
ge}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Da
n
i
el C
h
eng (aka
.
.
.
Fix b
a
sh completion in
p
a
th with
spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
b
a
sh comp
l
etion: only show 'l
o
g --
m
erge'
if mer
g
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nico -tel
m
ic
h
-
Schot
.
.
.
git-ta
g
(1
)
:
a
dd hint abou
t
co
m
mit m
e
ssag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Allan Caffee
Documentation:
u
pdate gra
p
h api example
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ha
m
ano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o
C
H
a
mano
Merge b
r
anch 'mai
n
t-
1
.
6
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2009-03-30
J
unio C H
a
mano
Merg
e
bran
c
h 'maint-1
.
6
.
0
'
in
t
o m
a
int
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Ja
y
Soffian
send
-
e
m
ail:
add tests for refactored prompting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
send-email:
r
efactor an
d
ensure prompt
i
ng doesn't loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
gi
t
-svn: fix
ls-tree usage w
i
th dash-prefixed paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
o
hannes Schindel
i
n
import-zips:
fix thinko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik
Fa
y
e-Lund
builtin-fast-e
x
po
r
t
.
c: hand
l
e
nested t
a
gs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Faye-
L
und
builtin-
f
ast-export
.
c
: fix crash on tagged trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik F
a
y
e
-Lund
builtin
-
f
a
st-e
x
port
.
c: turn
e
rror into warn
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Fa
y
e-L
u
nd
test-suite: adding
a test f
o
r
f
a
s
t-export wi
t
h
tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Hama
n
o
set_sh
a
red_per
m
():
sometimes
w
e know what th
e
final
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
move_temp_to_fil
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
Ju
n
io C
H
amano
M
erge
b
r
a
n
c
h
'mai
n
t'
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Ham
a
no
Update draft release notes to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge bra
n
ch 'jc/m
a
int-1
.
6
.
0-diff-borrow-ca
r
efu
l
ly'
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io C
H
amano
Merge branch 'js/rem
o
te-i
m
p
r
o
v
ements'
commit
|
commitdiff
|
tree
2009-03-28
Juni
o
C Ham
a
no
Merge
b
ranch '
j
k/clone-post-chec
k
out
'
commit
|
commitdiff
|
tree
2009-03-28
Jun
i
o
C H
a
m
a
no
Merge bran
c
h 'maint-
1
.
6
.
1'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-03-28
Emil Sit
test-lib: Cle
a
n up comments an
d
Makefile
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Michael Hendricks
f
ormat-patch: ad
d
arbitr
a
ry email head
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
Mo
v
e
c
hmod(foo, 0444
)
into
m
ove
_
temp_to_f
i
l
e(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next