repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fetch: avoid repeated commits in mark_complete
2011-05-20
Jeff King
fetch:
a
void repeate
d
comm
i
ts in m
a
rk_complete
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
ano
Updat
e
draft
release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
M
e
rge bran
c
h
'
jn/ma
i
n
t-for
m
a
t
-pa
t
ch-doc' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 's
s
/cherry-pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io
C Haman
o
Merge branch 'vr/m
e
rge-bas
e
-doc'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branc
h
's
r
/mai
n
t-fast-impo
r
t-tighten-
o
ption-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
ano
M
e
r
g
e bran
c
h 'jc/t1506-shell-p
a
ram-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge
b
ran
c
h
'jc
/
fi
x
-add-u-
u
n
merged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'jn
/
gitweb-dependency'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
Mer
g
e branch 'jc/
m
aint-branch-m
e
rge
o
ptions' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Ha
m
ano
Merge
b
ranch 'jc/maint-add-p-overlapping-hunks
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Doc
u
m
entat
i
on/git-fsck
.
txt: f
i
x typo: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
am
a
no
U
pdat
e
draft r
e
l
e
ase notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
amano
Merge branch 'cn/fo
r
mat-patc
h
-
q
u
i
e
t' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o C Haman
o
Merge
branch
'jm/mergetoo
l
-s
u
bm
o
dules'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
Hamano
Merge br
a
nch 'jk/
f
ormat-patch-quo
t
e-sp
e
cial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branc
h
'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
gi
t
_open
_
noatime(): dro
p
unused
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1
_
file: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
onathan Ni
e
d
er
add, merge, di
f
f: do not us
e
strcasecm
p
to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Prepa
r
e fo
r
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
no
M
e
r
ge b
r
a
nch 'a
w
/ma
i
nt-rebase-i-p-
n
o-ff'
i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'js/bl
a
me-pars
e
name
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge b
r
an
c
h
'gr/cvsimport-alt
e
r
nati
v
e
-cvsp
a
ss-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
M
erg
e
b
ranch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge
branch 'jk/merge-one-file-wo
r
k
i
ng
-
tree'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge br
a
nch 'jc/fix-diff-files-
u
nmerged'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branch 'mz/mai
n
t-rename-unmerged' i
n
to
m
ain
t
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t54
0
0
:
Fix a couple o
f
typo
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C
H
a
m
a
no
t1507
:
avoid
"${parameter
<
o
p>'word'}" ins
i
d
e d
o
ubl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C H
a
mano
t3701:
a
dd
-
p-
f
ix ma
k
es the last test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
a
ku
b
Narebski
R
emove gitweb/gitweb
.
cgi and othe
r
legacy targ
e
ts 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
N
ar
e
bski
git-inst
a
web:
Simplify build depe
n
dency 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
Junio
C
Hamano
merge: make
branch
.
<na
m
e>
.
mergeopti
o
ns
corr
e
ctly ove
r
ride
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
R
emove dup
l
icated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
S
verre
R
a
b
be
l
ier
fa
s
t-import: fi
x
o
p
t
i
on par
s
er
f
or n
o
-arg
op
t
io
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C H
a
m
a
no
t37
0
1: fix here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J G
r
uber
git-fa
s
t-imp
o
rt
.
txt: --rela
t
ive-mark
s
takes
n
o parame
t
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a
Sharov
shell: add missing initialization of argv0_pa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t
/
annotate-tests:
Use
echo & c
a
t ins
t
ead of s
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
H
a
m
a
n
o
Merge bra
n
ch 'j
h
/di
r
stat' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Ha
m
ano
Merge br
a
nch 'sp/maint-clear-postfi
e
l
d
s' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Me
r
ge
b
ranch 'jk/
m
a
i
nt-stash-oob' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-upload-pack-s
h
allow' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
e
rge br
a
nch 'd
m
/s
t
ash-
k
-i-p
'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hama
n
o
Merge branch
'
jc/pack-obje
c
ts-bigfile' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
H
amano
Merge
b
ranch
'
mg/r
e
f
log-with-option
s
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
Merge branch 'jk/s
t
ash-lo
o
sen
-
safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge
branch 'ar
/
cle
a
n
-rmd
i
r-empty'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
Ham
a
no
M
e
r
ge branch 'mg/s
h
a1-path-advise' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
g
i
t-add
.
txt: document 'add
.
ignoreErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
C
i
ar
a
n Jessup
Pass e
m
pty fil
e
to p4m
e
r
ge where
n
o base is
s
uitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Gu
y
Rouillier
Look for password in both CVS and C
V
SNT pas
s
word files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
merge
-
one-f
i
le: fix bro
k
e
n merges
w
ith
a
lternate
work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
a
dd tests 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 that
doe
s
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--interac
t
ive
.
perl: factor out repeated --reco
u
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hama
n
o
t3701: Editing a split hunk in an "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
a
n
o
add
-
p: 'q' should really quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
Sta
r
t 1
.
7
.
5
.
1
m
aint
e
n
a
nce track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge
bran
c
h 'mg/
x
-
y
e
ars-12-months' into
main
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-
s
e
nd-email: fix m
i
ssin
g
space in error
message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
sh Stone
bl
a
me: tolerate bogu
s
e
-ma
i
l
a
d
dr
e
sses a
b
i
t better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
An
d
r
ew Wong
g
it-
r
ebase--inter
a
c
t
ive
.
sh: preserve-merge
s
fai
l
s
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
e
f
f
K
ing
p
retty: quote rfc822 sp
e
cials in email a
d
dresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haene
l
git-sv
n
.
t
x
t
:
s
m
a
ll typeface improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Hae
n
el
git
-
svn
.
t
x
t: move option desc
r
iptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
V
a
lentin H
a
enel
git-svn
.
txt: fix
usa
g
e of --
a
dd-a
u
t
hor-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http: clea
r
POS
T
FIE
L
DS when i
n
it
i
alizing a slo
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
G
i
t 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "
a
dd -u" that
som
e
times fails
t
o resolve unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
diff-fi
l
es:
s
how unmerged entries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Haman
o
diff: remove often unused para
m
eters from diff_
u
n
m
erge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
m
a
no
diff
.
c: return filepai
r
from diff_
u
nmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use $_z40 from
test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J
Gruber
date: avoid
"
X years,
12
months" in relative dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Git
1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Hamano
S
yn
c
wit
h
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Juni
o
C H
a
m
a
no
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
ha
e
l J Gruber
g
it-svn
.
txt: Doc
u
ment --mergei
n
fo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Revert
"
r
u
n
-command: prettify -D_F
O
RTIFY_SOURCE wo
r
karo
u
nd"
commit
|
commitdiff
|
tree
2011-04-15
Sebas
t
ia
n
Schuberth
d
o
c: Clar
i
fy that "cherry-p
i
c
k -
x
" does not use
"git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
J
onathan Nieder
Docume
n
tation: desc
r
ibe the format o
f
messages wit
h
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nied
e
r
Res
t
ructure
documentation for gi
t
-
m
erge-base
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Vincent van Ravest
e
ijn
Documentation: update to git-mer
g
e-base -
-
o
c
topus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
J
unio C Hama
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-14
Re
n
é Scharfe
ar
c
h
ive: docum
e
nt limitation of ta
r
.
umask confi
g
s
e
tting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t3306,t53
0
4: avoid clock
s
k
ew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
ha
e
l J Gru
b
e
r
g
i
t
.
tx
t
:
f
ix list continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io
C
Ham
a
no
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hama
n
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
Hamano
Merge branch 'jc/rev
-
list-o
p
tions-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
M
e
r
ge branch 'js/
c
heckout-untracke
d
-symlink' int
o
maint
commit
|
commitdiff
|
tree
2011-04-13
Jon
a
thon Mah
mergetool:
Teach about submodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyerin
g
remove doubled
w
o
r
ds, e
.
g
.
, s/to to/
t
o/, an
d
fix
rel
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ra
m
kumar Ram
a
c
h
andra
r
e
vert: Hide '-
r
' optio
n
in defa
u
l
t
usa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martín N
i
eto
f
o
r
m
at-
p
at
c
h: docu
m
ent --quiet option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos
M
artí
n
Nieto
format-patch: don't pass o
n
the --quiet
fl
a
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirsta
t
: In case of renames, use target fil
e
n
ame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next