repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/technical/api-diff.txt: correct name of diff_unmerge()
2011-05-26
Brandon Casey
Docume
n
tation
/
technical/
a
pi-d
i
f
f
.
t
x
t
:
correct name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Th
a
i Ngoc Duy
ini
t
/
clone
:
remove short option -L and docum
e
nt --separat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Mi
c
ha
e
l J Gruber
git-s
v
n: Fix git svn log --show-comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Ha
m
an
o
Gi
t
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Ni
e
der
provide a copy
of t
h
e
LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Update draft r
e
l
eas
e
notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
ano
M
e
rg
e
branch 'jn/maint-form
a
t-pa
t
c
h
-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e br
a
nch 'ss/che
r
ry-
p
ick-x
-
doc' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge
b
ranch 'vr/merg
e
-ba
s
e
-doc' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
anch 'sr/m
a
int-fast-impo
r
t-tighte
n
-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
M
e
r
g
e
b
ranch 'jc/t1506-shell-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch 'jc/fix
-
add-u-
u
nme
r
ged
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C
H
a
mano
M
e
r
ge b
r
anch 'jn/gitweb
-
de
p
endency' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge bra
n
ch
'
jc/m
a
int-branch
-
m
ergeoptions
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C Hamano
Merge
b
r
an
c
h 'jc/maint-add-p-overlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Me
y
e
r
ing
Documentation/gi
t
-fs
c
k
.
txt:
f
i
x typo: unreadab
l
e -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Update draf
t
release notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Haman
o
Merge
b
ranch
'cn/format-patch-quiet' into
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merge
b
ra
n
ch 'jm/mergetool-subm
o
dule
s
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Haman
o
M
e
rge branch 'jk/fo
r
ma
t
-patch-qu
o
t
e-specia
l
-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
amano
Merge bra
n
c
h
'vh/gi
t
-svn-doc' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
H
a
mano
git_open_no
a
t
im
e
(): dro
p
unused pa
r
amete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
s
ha1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jo
n
athan
N
ieder
add, merge, diff: do
n
ot use strc
a
secm
p
to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
P
r
e
pare for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e b
r
anc
h
'aw/maint-rebase-i-p-no-ff' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
a
man
o
Merge branc
h
'
j
s/bl
a
me-par
s
e
n
ame'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ha
m
ano
Merge branch
'gr/cv
s
impo
r
t-alternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
amano
Merge branch 'cj/p4m
e
rge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge bran
c
h
'jk/merge-one-fi
l
e-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
am
a
n
o
Merge branch 'jc/fix-dif
f
-files-unmerged'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
m
an
o
Merge
branch
'mz
/
maint-
r
ename-unmerged'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rlan
d
t
5400: Fix a co
u
ple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Ha
m
a
n
o
t1507:
a
void "${pa
r
ameter
<
o
p
>'word'}" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
io C Hamano
t37
0
1
:
a
dd-p-fix ma
k
es the last t
e
st t
o
pa
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
R
e
move gitweb/gitweb
.
cgi and other legacy targets from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
git-instaweb: S
i
mpl
i
f
y
buil
d
dependency on gitweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Ham
a
no
mer
g
e: m
a
k
e branch
.
<
name
>
.
mergeoptions correctly ov
e
rri
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Bri
t
to
Remove duplicated "is a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbelier
fast-
i
mport: fix opt
i
on parser for no-a
r
g
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701:
fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-fast-import
.
txt: --re
l
ative-ma
r
ks takes no paramete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima S
h
arov
she
l
l: add
mi
s
sing
initi
a
l
izati
o
n
o
f
a
rgv0_pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Bria
n
G
e
rnhardt
t/annotate-
t
e
sts: Use echo
& cat
i
nstead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
G
i
t 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge b
r
anc
h
'jh/dir
s
t
at'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge bra
n
ch 'sp/maint-clear-postfiel
d
s' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge br
a
nch 'jk/maint
-
stash-o
o
b
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Hamano
Merge branch 'jk/maint-upload-pack-shal
l
ow' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Haman
o
Merge bra
n
c
h 'dm/stash-k
-
i
-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
e
r
ge branch 'jc/
p
a
c
k-
o
bjects-bi
g
file
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branch 'mg/reflo
g
-wit
h
-options'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Hamano
Merge branch 'jk/stash-l
o
osen-sa
f
ety' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge b
r
anch
'
ar/clean-rmdir-empty' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
e
rge
b
r
anch 'mg/sha1
-
path-advise'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
V
alen
t
in Haene
l
gi
t
-
add
.
txt: do
c
u
ment 'add
.
ignoreEr
r
ors
'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ci
a
ran Jessup
P
ass
e
mpty
f
ile to p
4
merge whe
r
e
no ba
s
e
is suit
a
ble
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y Rouillie
r
Look for p
a
s
sw
o
rd in both CVS
a
nd CV
S
NT
p
assword
f
iles
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Ki
n
g
m
erge
-
o
n
e-file
:
fix broken m
e
rges
with
a
lt
e
rnate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
eff
King
add
te
s
ts for merge-index / merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -
p
": work-around an old laziness tha
t
doe
s
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
a
d
d--intera
c
tive
.
perl:
f
actor
out repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Haman
o
t3
7
01:
Editing a
s
plit hunk in an "add -p
"
session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
add -p: 'q' should
really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
Start 1
.
7
.
5
.
1 m
a
i
n
tenan
c
e trac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
a
mano
Merge
b
ranch 'mg/x-years-12-mont
h
s' into main
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git
-
s
e
n
d
-email
:
fix missing spac
e
in err
o
r
m
e
ssage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tole
r
a
t
e bogus
e
-mail addresses a
bit bett
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
And
r
ew
Wong
git-rebase--interactive
.
sh: preserve
-
merges f
a
i
l
s
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
p
r
etty: quote rfc822 spe
c
i
als in email
a
d
dre
s
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
g
i
t
-svn
.
txt: sm
a
ll typeface improve
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
a
lentin Haenel
gi
t
-sv
n
.
txt: move option
d
e
scriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-
s
v
n
.
txt: fix usage
of
--add
-
author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jun
i
o C Hamano
http:
clear POS
T
FIELDS whe
n
initializing a s
l
ot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Ha
m
an
o
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
Fix "a
d
d -u" that
sometimes fails
t
o
resolve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
d
iff-files: show unmer
g
ed entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o
C Hama
n
o
diff:
remove often unused parameters fr
o
m d
i
ff_unm
e
rg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
diff
.
c: return filepair from
d
iff_unme
r
g
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Haman
o
t
e
st: use $_z40 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
date: avo
i
d "X years, 12 months"
i
n relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
amano
G
i
t 1
.
7
.
5
-
rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Sy
n
c w
i
th 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
unio C Hamano
Gi
t
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J
Gr
u
b
er
g
it-svn
.
txt: D
o
cument --
m
ergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
unio C Hamano
Revert "run-com
m
and:
p
rettify -D_FO
R
TIFY_SOURCE wor
k
aro
u
nd"
commit
|
commitdiff
|
tree
2011-04-15
Sebastia
n
Schuber
t
h
doc: Cl
a
rify
that
"
cherry-pick
-x" do
e
s not u
s
e "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nied
e
r
Document
a
tio
n
: descr
i
be the format
of messages with
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
J
onath
a
n N
i
eder
Restruct
u
re doc
u
mentatio
n
for git-merge-base
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Vi
n
c
e
nt van Ravestei
j
n
Documentation: update to
g
it-merge-base --octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
J
u
nio C Ha
m
ano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
Ren
é
Scharfe
archive:
docum
e
nt lim
i
tation of tar
.
u
m
ask
config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
ael
J
Grub
e
r
t3306,t5
3
04:
avoid c
l
ock s
k
ew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
M
i
chael J Gruber
git
.
txt: fix list continuati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
G
it 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hamano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ha
m
an
o
Merge
b
ranch 'jc/rev-list-
o
ptions-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
a
mano
Merge branch
'js/checkout-untrac
k
ed-s
y
mlink' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-04-13
J
o
nath
o
n Mah
m
e
rgetool: Teach
a
b
o
u
t submod
u
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
remove d
o
ub
l
ed words, e
.
g
.
, s/to to/t
o
/, and fix related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next