repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Wait for git diff to finish in git difftool
2009-04-13
Nanako
S
h
i
ra
i
shi
Documenta
t
io
n
/
g
it
.
t
xt: GIT 1
.
6
.
2
.
2 has
b
een out for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Jun
i
o C Hamano
Merge br
a
nch 'jk/n
o
-perl'
commit
|
commitdiff
|
tree
2009-04-12
Junio C Ham
a
no
Merge branch
'
sb/
d
oc-upstream-br
a
n
ch'
commit
|
commitdiff
|
tree
2009-04-12
J
un
i
o C Hamano
Merge branc
h
'jk/sho
w
-upstream'
commit
|
commitdiff
|
tree
2009-04-12
Junio C
H
amano
Merg
e
bran
c
h '
f
g/remote-prune
'
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
M
e
rge
b
ran
c
h
'
c
c/sha1
-
b
s
e
arch
'
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
Merge bra
n
c
h
'cc/bisect-filter'
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
GIT
1
.
6
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
Merge
b
ranch '
m
aint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-12
Junio C Hamano
Merge branch '
m
aint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-12
Da
v
id
A
guilar
mergetool--lib: simplify
A
P
I us
a
ge by re
m
oving
m
o
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
niel Chen
g
(ak
a
.
.
.
State the
e
ffe
c
t
of filter-b
r
an
c
h on gra
f
t expl
i
citly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Linus Torvalds
process_{
t
r
e
e,blob}:
Re
m
ove u
s
el
e
ss xstrdup cal
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Johannes Sixt
t13
0
1
-
share
d
-repo: fi
x
forc
e
d mo
d
es test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Ben Walton
documentation: Makefile acco
u
nts
f
or SHELL_PATH setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
L
i
nus Torvalds
Allow users to u
n
-conf
i
g
u
r
e
r
ena
m
e
det
e
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
M
i
k
e Ho
m
mey
Replace ",
<
,>,&
with th
e
ir res
p
ec
t
ive XML enti
t
i
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Johannes Schind
e
lin
g
i
t
-
svn: al
w
ays initiali
z
e with core
.
a
utocrlf=f
a
lse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-12
Dan McGee
Updat
e
de
l
t
a
compression
m
e
ss
a
ge to be le
s
s
mi
s
le
a
ding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-11
F
e
rry Huberts
Fix misspe
l
led
m
er
g
e
tool
.
keepB
a
ckup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-11
Erik Broes
git-shell: Ad
d
'git-uploa
d
-
archive' to allowed commands
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-11
L
inus Torv
a
lds
Al
l
ow u
s
ers to
un-con
f
igu
r
e rename
d
etec
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Jeff King
a
d
d tests
f
or r
e
mote gr
o
ups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
U
pdate
draft re
l
ease not
e
s to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Junio C
H
aman
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-04-09
J
unio C Hamano
Start 1
.
6
.
2
.
3 pr
e
par
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
J
u
n
i
o C Hamano
Merge branch 'j
c
/sh
a
red-literally' in
t
o maint
commit
|
commitdiff
|
tree
2009-04-09
J
u
nio
C Hamano
M
erge branch 'jc/
m
aint-1
.
6
.
0-diff
-
borro
w
-carefully
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Hamano
M
e
rg
e
branc
h
'maint-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-09
Junio
C
Hamano
Merge bra
n
c
h 'm
a
int-1
.
6
.
0' into
m
aint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Juni
o
C Ha
m
ano
Merge
branch 'j
c
/maint
-
1
.
6
.
0-kee
p
-pack
'
into
maint
commit
|
commitdiff
|
tree
2009-04-09
J
unio C Hama
n
o
M
erge
branch 'jc/maint-1
.
6
.
0-blame-s'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-09
Ju
n
io C
H
a
m
ano
Merge br
a
nc
h
'
b
c
/
m
aint-1
.
6
.
1-branch-deleted-
w
a
s' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C
H
a
m
ano
Merg
e
br
a
nch 'js/maint-1
.
6
.
0-exec-pa
t
h-env' i
n
t
o
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Junio C Ha
m
ano
Merge b
r
a
n
ch
'tr/maint-1
.
6
.
1-doc
-
format-patc
h
-
-root
.
.
.
commit
|
commitdiff
|
tree
2009-04-09
Björn
St
e
inbri
n
k
process_{tree,blob}: Remove u
s
eless
xstr
d
u
p calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Jef
f
Ki
n
g
t
e
sts: skip perl tests if NO_PERL i
s
de
f
i
n
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-09
Jeff
K
ing
Makefile: allow
b
uilding without perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thieu Moy
gi
t
-pull
.
sh: better
warning message for
"
git pull"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d A
g
uil
a
r
difftool/mer
g
eto
o
l: refac
t
or c
o
mma
n
ds to use git
-
m
e
rgetool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
J
e
ff King
branch: s
h
ow upstream b
r
a
n
ch when double verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Je
f
f K
i
ng
make get_
s
ho
r
t_ref a
public
func
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for-eac
h
-ref: add "up
s
tream" format fiel
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
fo
r
-eac
h
-ref:
refact
o
r r
e
fnam
e
handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio C H
a
mano
M
e
rg
e
br
a
nch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2009-04-08
Jari Aalto
Chan
g
e double
q
uotes to singl
e
quotes in
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hama
n
o
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
J
unio
C Hamano
Mer
g
e branc
h
'lt/
r
e
flog-expi
r
e'
commit
|
commitdiff
|
tree
2009-04-08
J
u
nio C Hamano
Merg
e
branch 'bs/maint-1
.
6
.
0-tree-
w
alk-prefix'
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
Merge branch 'ms/
h
ttp-auth'
commit
|
commitdiff
|
tree
2009-04-08
Junio
C
H
amano
Merge br
a
nch 'js/ma
i
n
t
-
s
ubmodule-checkout'
commit
|
commitdiff
|
tree
2009-04-08
Junio C Ham
a
no
Merge branch
'cb/maint-merg
e
-recursive-
s
ubmodu
l
e
-
fix'
commit
|
commitdiff
|
tree
2009-04-08
Junio C Ham
a
no
Merg
e
branch 'mh/html-path'
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d
Aguila
r
mergetool: u
s
e $(
.
.
.
)
instead of `backticks`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
bash
comp
l
etion: add
git-diffto
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
add
s
uppo
r
t
for a difftool
.
p
rompt conf
i
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
dif
f
t
o
o
l: add var
i
ous
git-difftool
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
ftool: move 'git-difftool'
o
ut of contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Seba
s
tian P
i
pping
di
f
ftool/merg
e
tool
:
ad
d
diffuse as merge an
d
d
i
ff tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d A
g
uilar
difftool: add a -y shortcut f
o
r
--
n
o-prom
p
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
A
guilar
di
f
ftool: use perl built-ins
w
h
e
n test
i
ng for msys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: re
m
ove t
h
e
backup fil
e
feature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguila
r
difft
o
ol: remove m
e
r
g
e options f
o
r o
p
en
d
i
f
f, tkd
i
ff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelberg
git-mergeto
o
l: add new merge tool TortoiseMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mark
u
s Heidel
b
erg
gi
t
-
mergetoo
l
/
d
i
f
f
t
ool: mak
e
(g)vimdiff workab
l
e under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mar
k
us He
i
d
elber
g
doc/merge-config: list ecmerge as a bui
l
t-
i
n
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Christian Cou
d
er
rev-list: add "int bisect_show_
f
lags" in "struct rev_list_info"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Ch
r
istian C
o
uder
rev-list: remove la
s
t static va
r
s
u
s
ed in "show_commit"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Christian Couder
list-objects
:
a
dd "void *dat
a
"
param
e
ter to show functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthie
u
Moy
git-rev-list
.
txt: make ascii mar
k
up uniform
wit
h
ot
h
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
M
oy
g
i
t-se
n
d-email
.
t
x
t: cla
r
ify which
opti
o
ns tak
e
an argument
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for-each
-
ref: refactor get_short_ref function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
S
a
nti
Béjar
Documentat
i
on: Introduc
e
"upstrea
m
branch
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jason Merril
l
Documentation: c
l
arif
y
.
gitattri
b
utes
search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu M
o
y
git-checkout
.
txt: clarify
t
ha
t
<branch> a
p
plies when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-checko
u
t
.
tx
t
:
fix incorrect statement
a
bout HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Finn Arne Gangstad
git remote update: Fa
l
lback to
r
e
m
o
te if group does
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Finn Arne Gan
g
stad
r
e
m
o
te: New function remote_is_c
o
nfigured(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
F
i
nn Arne Gangstad
g
i
t
remo
t
e update: Repor
t
erro
r
for non-
e
xisting grou
p
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio
C
Hamano
sha1-lookup: fix
u
p the assertion mess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
J
un
i
o C Ha
m
ano
Me
r
ge b
r
anch 'jc/
n
ame-branch'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branc
h
'jc/sha
r
ed
-
lit
e
rally'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hama
n
o
Merge branch
'
m
g
/track
e
d
-loca
l
-branches
'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge bra
n
ch 'sb/format
-
p
atch-
p
at
c
hname'
commit
|
commitdiff
|
tree
2009-04-06
Felipe C
o
ntreras
user-manual: t
h
e name of
t
he hash functi
o
n
i
s
SHA-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felip
e
Contrera
s
docbook:
c
hange css style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe C
o
ntr
e
ras
user-manual: rem
o
ve
some git-foo usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béj
a
r
Documentation: branch
.
*
.
m
erge can also af
f
ect
'
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voigt
Add
configuration variable for sign
-
o
f
f to format-patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zullinger
bash com
p
letion: Updat
e
'git am' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Finn Ar
n
e
Gangstad
git remote update
:
N
ew option --prune
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Fin
n
Ar
n
e Gangsta
d
builtin-remot
e
.
c: Split out prune_remote as a separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Co
u
d
er
bisect
-
-help
e
r: string
outpu
t
variables
toge
t
h
er w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
re
v
-
l
ist: pass "int f
l
a
g
s" as
l
ast
argument
o
f "show_bisect_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
t6030: test
b
isecting wi
t
h paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
b
isect: use "bisect--he
l
per" and
rem
o
ve
"fil
t
er_skipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
bisect: imp
l
emen
t
"re
a
d_bisect_paths" to read
path
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Ch
r
ist
i
a
n
Cou
d
er
bisect--help
e
r: implement "git bisect--helper"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next