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
Add Code Compare v2.80.4 as a merge / diff tool for Windows
2012-08-10
Seb
a
st
i
an Schuberth
Ad
d
Code C
o
mpare v2
.
80
.
4 as a merge / diff
too
l
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-10
D
a
v
i
d Agu
i
lar
mergetool,difftool: Docu
m
ent -
-
tool-help consistently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Disa
b
l
e
--symlink
s
on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Ag
u
ilar
diff
t
ool: Handl
e
c
omp
a
re()
r
eturning -1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
diff
t
ool: Wrap long lines fo
r
readability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid A
g
uilar
difftool: C
h
eck al
l
ret
u
rn cod
e
s from compare()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guil
a
r
difftool
:
Handl
e
finding
m
ergetools/ in a path with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguil
a
r
difftool
:
Use sy
m
links when diffing against the worktree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
David
A
g
uilar
difftool: Cal
l
the temp direc
t
ory "git
-
diff
t
ool"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
difftool: Move
o
ption values into a ha
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
a
r
d
ifftool: Eliminate globa
l
variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguil
a
r
d
i
fftool: Simp
l
i
fy print_tool_help()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-19
T
i
m
H
eni
g
a
n
difftool: only copy back f
i
l
es modifie
d
during
d
irectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Junio C H
a
m
a
no
Git 1
.
7
.
1
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Junio C Ha
m
ano
Sync with 1
.
7
.
10
.
5
commit
|
commitdiff
|
tree
2012-06-17
J
u
nio C
H
a
m
ano
Git 1
.
7
.
1
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Vincent
v
a
n Rave
s
teijn
Do not autosquash in case of an implied interactive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
J
un
i
o
C
Hamano
Merge branch 'js/maint-fast-e
x
port
-
mark-error' into
.
.
.
commit
|
commitdiff
|
tree
2012-06-15
Ju
n
io C Hamano
Merge git://git
h
ub
.
c
om/git-l10n/g
i
t-po
commit
|
commitdiff
|
tree
2012-06-15
Juni
o
C
H
a
mano
Merge branch 'as/diff-
s
h
orts
t
at-ignore-b
i
nary'
commit
|
commitdiff
|
tree
2012-06-15
Alexander Strasser
diff: Only c
o
unt li
n
es in
show
_
s
h
ortstat
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-15
Jonatha
n
Nieder
perl/Makef
i
le: in
s
t
all Git::S
V
N:
:
* when
N
O
_
PERL_MAKE
M
AKER
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-15
Jonat
h
an Nieder
perl/Ma
k
efile
.
PL: warn about du
p
licate
m
odule list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-13
Junio C Hama
n
o
Me
r
ge branch 'rj
/
gitweb-test-s
a
ns-date-parser'
commit
|
commitdiff
|
tree
2012-06-13
Ju
n
io
C
Hamano
Merge branch 'fc/git-complete-helper-fix'
commit
|
commitdiff
|
tree
2012-06-13
SZEDER Gábo
r
c
o
mpletion: remove credent
i
al helpers from porcelain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-13
S
Z
ED
E
R Gábor
comp
l
etion
:
pu
t
mai
n
git and git
k
co
m
pletion
f
unctions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Ramsay Jones
git
w
eb
:
Skip 'm
o
dification times' tests when no date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Junio C Hamano
Git
1
.
7
.
11-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Junio C Hamano
Merge
git://githu
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-06-12
Junio C Hamano
Merge
branch 'mm/
a
pi-creden
t
ials-doc'
commit
|
commitdiff
|
tree
2012-06-12
Junio C H
a
mano
Merge branch 'jc/fmt-mer
g
e-msg
-
peop
l
e'
commit
|
commitdiff
|
tree
2012-06-12
Matthieu Moy
api-credenti
a
l
.
txt: doc
u
ment
t
hat helpers field is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Junio C Hamano
Merge branch
'
js/maint
-
fast-expor
t
-mark-error'
commit
|
commitdiff
|
tree
2012-06-12
Johannes S
c
hindelin
f
ast-e
x
port
:
repo
r
t SHA-1 ins
t
ead of gibberish
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-08
Junio C Ha
m
ano
Merge branch 'm
m
/a
p
i-cred
e
ntials
-
doc'
commit
|
commitdiff
|
tree
2012-06-08
J
e
f
f King
docs: fix cross-directory linkgit r
e
ferences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-07
Junio C Hamano
Git 1
.
7
.
11-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-07
Junio C Hamano
Merge
b
r
a
nch 'mm/api-credenti
a
l
s-doc'
commit
|
commitdiff
|
tree
2012-06-07
Junio
C
Hamano
Merge branch 'r
r
/mai
n
t-t3
5
10-casca
d
e-fix'
commit
|
commitdiff
|
tree
2012-06-07
Junio C Hamano
M
erge branch 'jc/svn
-
auth-providers
-
unu
s
able-
a
t
-
1
.
6
.
12
'
commit
|
commitdiff
|
tree
2012-06-07
J
u
nio C Hamano
Merge branch 'cr/persistent-https'
commit
|
commitdiff
|
tree
2012-06-06
J
unio
C
Haman
o
f
m
t-merge-msg: make attribution
i
n
to comment lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-05
Junio C Hamano
Merge git://github
.
co
m
/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-06-04
Ramk
u
m
a
r Ramach
a
ndra
t3510 (cherry-pick-sequence): add miss
i
ng '&&'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Matthieu
M
oy
api-credentials
.
tx
t
: add "see also"
s
e
ctio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Matt
h
ieu
Moy
a
p
i-cre
d
enti
a
ls
.
txt: m
e
ntion credential
.
h
e
l
per e
x
plicitly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Matthieu Moy
api-creden
t
ials
.
txt: show
t
h
e
b
i
g
picture first
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Ju
n
io C Ha
m
ano
doc: fix xref link from
api
docs
t
o
manual pages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Junio
C
Hamano
git-svn: platform auth providers are w
o
r
king only on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Junio C Hamano
Git 1
.
7
.
11-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Junio C Hamano
Sync with 1
.
7
.
10
.
4
commit
|
commitdiff
|
tree
2012-06-03
J
u
nio C
H
amano
Git 1
.
7
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Junio C
Hamano
M
e
r
g
e branch 'ef/maint-rebase-er
r
o
r
-mess
a
ge' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hama
n
o
Update
d
r
aft releas
e
no
t
es t
o
1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-01
Junio C
H
amano
Merge branch 'ef/maint-rebas
e
-er
r
o
r
-
m
essage'
commit
|
commitdiff
|
tree
2012-06-01
J
u
n
io C Hamano
Merge b
r
an
c
h '
n
h/empty-rebase'
commit
|
commitdiff
|
tree
2012-06-01
Jun
i
o C Hamano
Merg
e
b
r
a
nch 'vr/
r
ebase-autosquas
h
-does-not-imply-
i
'
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
M
e
rge bra
n
ch 'mm/levenstein-penalize-deletion-le
s
s'
commit
|
commitdiff
|
tree
2012-06-01
Junio
C
Ha
m
a
n
o
Mer
g
e branch 'jl/s
u
bmod
u
le-report-new-path-once'
commit
|
commitdiff
|
tree
2012-06-01
Junio
C
Hamano
Sync
w
i
t
h main
t
commit
|
commitdiff
|
tree
2012-06-01
Junio C
H
a
mano
Start pr
e
p
a
ring
f
o
r
1
.
7
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-01
Junio C
Hamano
Merge b
r
anch
'ef/htt
p
-o-depends-o
n
-
g
vf' into
maint
commit
|
commitdiff
|
tree
2012-06-01
Jun
i
o C Hamano
Merge git:
/
/github
.
com/
g
it-
l
1
0
n/git-po
commit
|
commitdiff
|
tree
2012-06-01
Junio C
H
am
a
no
M
e
rge
b
ranc
h
'rs/maint-gre
p
-
F
'
into
mai
n
t
commit
|
commitdiff
|
tree
2012-06-01
Junio C Ham
a
no
Mer
g
e branch
'
jk/ident-split-fix' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
M
erge branch 'j
k
/pretty-com
m
it-header
-
i
n
c
o
mplete-line
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio
C
H
a
mano
Merge b
r
an
c
h 'j
k
/format-person-part-buffer-limit' into
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
J
unio C Hamano
M
erge branc
h
'ap/checkout-no-pr
o
gress-for-non-
t
ty'
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Juni
o
C Ham
a
no
Merge branch 'maint' of
g
i
t
://
g
ithu
b
.
co
m
/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Jia
n
g Xi
n
i18n: apply: split to fix a partial i18n message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-31
E
r
ik Faye-Lund
Makefile: add missing GIT-VE
R
SION-FILE depen
d
enc
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Colby Ranger
Ad
d
persistent-htt
p
s to contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Erik F
a
ye-Lund
reba
s
e: rep
o
rt invalid c
o
mmit c
o
rrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Jeff K
i
ng
INST
A
LL: update asciidoc rec
o
mme
n
dation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Ju
n
io C
Hamano
cherr
y
-pick: regre
s
sion fix f
o
r empty commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
J
e
ns
L
ehmann
su
b
modul
e
s:
p
rint "r
e
giste
r
e
d for path" message only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Junio C Haman
o
Mer
g
e gi
t
://bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-05-29
J
e
ff
K
ing
t5
7
01: mo
d
ernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
J
u
n
io C Hama
n
o
Merge branch 'va
/
gi
t
-
p4-test'
commit
|
commitdiff
|
tree
2012-05-29
Ju
n
io C Hamano
Merge bra
n
ch 'jk/ident-ge
c
os-strb
u
f'
commit
|
commitdiff
|
tree
2012-05-29
J
u
n
i
o C
Hamano
Mer
g
e
bran
c
h 'jk/fetch-pack-remove-dups
-
opt
i
m'
commit
|
commitdiff
|
tree
2012-05-29
Junio C Ham
a
no
Me
r
ge branch 'rs/refs-st
r
i
ng-slice'
By René Scharfe (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-29
Junio C
H
amano
Merge branch 'mh/fetch-pack-constness'
commit
|
commitdiff
|
tree
2012-05-29
Junio C Ha
m
ano
Merge branch 'mh/r
e
f-api-lazy-
l
o
os
e
'
commit
|
commitdiff
|
tree
2012-05-29
Junio C
Ha
m
ano
M
e
r
ge branch 'ng
/
pack-obj
e
cts
-
cleanup'
commit
|
commitdiff
|
tree
2012-05-29
Vincent van Ravesteijn
Do not
autosquash in case of
a
n imp
l
ied
interactiv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Ma
t
thieu Moy
R
e
duce cost of deletion
i
n l
e
venstein distance (4
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Vitor Antunes
git-p
4
: Cl
e
an up b
r
anch test cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Vitor Antunes
g
i
t-p4: Verify detection
of "empty" branch c
r
ea
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Vito
r
Antunes
git-p4:
Test cha
n
g
e
lists touc
h
ing tw
o
branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
Junio C H
a
mano
Git 1
.
7
.
1
1
-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
Junio C H
a
mano
M
er
g
e branch '
s
p
/
sh-win
d
ows-pwd'
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
M
erg
e
branch 'mh/test
-
keep-
p
r
ove-cache'
commit
|
commitdiff
|
tree
2012-05-25
Junio
C
Ham
a
n
o
Merge branch 'rs/dir-strbuf-read-recursive
-
fix'
commit
|
commitdiff
|
tree
2012-05-25
Junio C H
a
mano
Me
r
ge branch 'fc/git
-
complete
-
helper-fix'
commit
|
commitdiff
|
tree
2012-05-25
Junio C H
a
mano
M
e
rge
b
r
anch 'ap
/
checkout-no-pr
o
gr
e
ss-for-non-tty
'
commit
|
commitdiff
|
tree
2012-05-25
Jun
i
o
C
Hamano
Merge branch 'jk/f
o
rmat
-
per
s
on-p
a
r
t
-
b
uffer-li
m
it'
commit
|
commitdiff
|
tree
2012-05-25
Junio C
Hamano
Merge bra
n
ch 'jk/pretty-commit-header-incomplete-line
'
commit
|
commitdiff
|
tree
2012-05-25
Juni
o
C
Hamano
Merge branch 'j
k
/ident-split-fi
x
'
commit
|
commitdiff
|
tree
next