repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
test that git status works with merge conflict in, .gitmodules
2011-05-14
Heiko Voigt
test
t
hat git status works
w
ith merge co
n
flict in,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C
H
ama
n
o
Prepare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branc
h
'aw/maint-r
e
base-i-p
-
no-ff' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
a
ma
n
o
Merge bran
c
h 'js/blam
e
-parsenam
e
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merg
e
branch 'gr/cvsi
m
p
o
rt-
a
lt
e
r
native-cvspass-locati
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
r
ge
branch 'cj/
p
4me
r
ge
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merg
e
b
r
anch 'jk/merge-one-
f
ile-wor
k
i
n
g-t
r
ee' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
M
erge bra
n
ch 'jc/
f
ix-dif
f
-files-unmer
g
ed' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'mz/mai
n
t-re
n
ame-unmerged
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Johan Herl
a
nd
t
5400: Fix a couple of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Remove
d
uplica
t
ed "
i
s a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
un
i
o
C Haman
o
t3701:
f
ix here docu
m
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-fast-im
p
ort
.
txt: --relative-
m
a
rks
takes
n
o
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
h
ell: add missing init
i
a
lization of argv
0
_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gern
h
a
rdt
t/a
n
notate-test
s
: Use e
c
ho &
cat
i
n
stead
of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Git
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge b
r
anch 'j
h
/dirstat' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o C Hamano
Merge branch '
s
p/main
t
-
clear-postfield
s
' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge bra
n
ch 'jk/main
t
-stash-oob' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merg
e
b
r
anch 'jk/maint-
u
pload-
p
ack-sha
l
low' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge
branch 'dm/stash-k-i-p' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hama
n
o
Merge branch
'
jc
/
pack
-
objects-b
i
gfile' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
M
e
rge br
a
nch
'mg/r
e
flog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
br
a
n
ch 'jk/s
t
ash-
l
oosen-safety' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
M
erg
e
branc
h
'ar/clean-rmdir-emp
t
y' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
aman
o
Merge
b
ran
c
h 'mg/sha1-path
-
a
d
vise
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
lentin
H
a
enel
g
i
t
-add
.
t
xt: d
o
cum
e
nt
'
a
d
d
.
igno
r
eErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
Pass empty file to
p4merge where
n
o base is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rou
i
llier
Look for password in both
C
V
S
and CVSNT
password file
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Kin
g
merge-one-file: fix
broken merges w
i
th alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for merge-in
d
ex / merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
unio
C
Ham
a
no
Start 1
.
7
.
5
.
1
m
aintenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C H
a
m
a
no
Merg
e
b
r
anch 'mg/x-ye
a
rs-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvai
n
R
a
bot
git-send-email: fix
missing space in erro
r
messag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Ston
e
b
lame:
t
olerat
e
b
ogus e-mail addresses a bit
b
e
tt
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wo
n
g
git-rebase--inter
a
ctive
.
sh
:
preserve-
m
erg
e
s fai
l
s on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
Hamano
http: cl
e
ar POSTFIE
L
D
S wh
e
n initializing a
s
lot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Ham
a
no
Git
1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
diff
-
files: s
h
ow un
m
e
r
g
ed entries corr
e
c
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
diff: r
e
mo
v
e o
f
ten unused parameters
from di
f
f_unmer
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
ff
.
c:
r
eturn filepair from diff_unmerge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
mano
test: use
$
_z40 fr
o
m
tes
t
-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
date: avoid "X y
e
ars, 12 m
o
nth
s
" i
n
relativ
e
d
a
t
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git 1
.
7
.
5-
r
c3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
n
io C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git
-
svn
.
txt: Docume
n
t
--merg
e
info
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Juni
o
C
H
amano
Rev
e
rt "r
u
n-c
o
mmand: prettify
-
D_
F
ORT
I
FY_S
O
URCE workaro
u
nd"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hama
n
o
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-14
Ren
é
Sch
a
rf
e
arc
h
i
ve: document
li
m
it
a
ti
o
n of
tar
.
umask config
s
e
tting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
ae
l
J Gruber
t
3
306
,
t530
4
: avoi
d
clo
c
k skew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l J G
r
uber
git
.
txt: fix
l
i
st continuat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C H
a
mano
Git
1
.
7
.
5-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C Hamano
M
e
rge bra
n
c
h
'
m
a
int'
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C H
a
mano
Merge branch '
j
c
/
r
ev-list-option
s
-
f
ix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hama
n
o
M
e
rge branch
'
j
s
/checkout-untracked-sy
m
link
'
into m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyerin
g
remove d
o
ub
l
ed words,
e
.
g
.
, s/
t
o t
o
/to/, a
n
d fix r
e
lated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar
Ram
a
chandra
reve
r
t: Hide '
-
r' option
i
n default usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n
Herlan
d
-
-
dirs
t
at: In case o
f
renam
e
s, us
e
target file
n
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio
C Hamano
M
erge br
a
nch 'js/che
c
kou
t
-untrack
e
d-sy
m
link'
commit
|
commitdiff
|
tree
2011-04-12
Junio C
H
a
man
o
Merge
branch
'nd/init-git
d
ir
'
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
nes
S
ixt
t2
0
21: mark a test
as fixed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t0001: g
u
ard a ne
w
test with
S
YM
L
INKS prer
e
quisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
a
n
d
Teach --dirstat not to co
m
p
letely ignore rearran
g
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfj
ö
rð Bj
a
rm
a
son
M
ake
f
ile: extract Q_() source string
s
as ngettex
t
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i18n: avoid parenthesi
z
ed s
t
r
i
ng as array ini
t
ializer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
-
-
d
i
rstat-
b
y-file:
M
ake it faster and more correc
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dirsta
t
: Desc
r
ibe non-ob
v
ious difference
s
relativ
e
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Junio C H
a
mano
Merge
git://git
.
bogomips
.
org/g
i
t-svn
commit
|
commitdiff
|
tree
2011-04-11
J
u
nio C H
a
mano
Merge git://gi
t
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan McG
e
e
s
ta
s
h
:
ensure --
n
o-keep-in
d
ex and -
-
patch can b
e
used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stash: ad
d
two more tests for --no-keep-index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Andr
e
w Ga
r
ber
git-p4:
r
eplace each tab with 8 spaces for
c
onsistency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f
King
upl
o
a
d
-
pack:
s
tar
t
p
a
c
k
-objects before asy
n
c rev-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Ham
a
no
Git
1
.
7
.
5-rc
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
S
ync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
n
o
Git 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
ano
Mer
g
e
br
a
nch 'nm/
m
aint-
c
onflicted-s
u
bmodule-e
n
trie
s
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Me
r
ge branch 'mg/
r
ev-l
i
st-n-rev
e
rse-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Hamano
Mer
g
e bran
c
h
'jk/maint-
r
e
m
ote-m
i
rro
r
-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branch 'mg/do
c
-revis
i
ons-txt
'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
s
tash: dro
p
d
i
rty worktree check on apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hama
n
o
Teach core
.
bi
g
filethreas
h
o
ld to pack-o
b
jects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
stash: fix fa
l
se positive in
t
h
e
invali
d
re
f
test
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash
:
fix
a
c
c
i
dental apply
o
f
n
on-
e
x
i
sten
t
stashes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Michae
l
J Grube
r
revisio
n
s
.
txt: langua
g
e
improvement
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ha
m
ano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-04-04
J
unio C H
a
mano
Merge branch 'jl/su
b
modu
l
e-fet
c
h-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o C Ha
m
ano
Merge branch 'jc/rev-list-options-fix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDE
R
Gá
b
or
Documentation:
trivial grammar
f
ix in core
.
w
orktree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
a
kub Narebski
git
w
eb: Fix
p
arsi
n
g o
f
negative
f
ractional timezones
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch 'nm/maint
-
conflicted-subm
o
dule-entries
'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C Hamano
Star
t
p
reparing for 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jef
f
K
ing
pull: do not
c
lobber untracked f
i
les on initial
p
ull
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge bran
c
h '
j
c/i
n
d
e
x
-
update-i
f
-able
'
into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
mano
Merg
e
b
ranc
h
'lt/defaul
t
-abbrev'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'jc
/
maint
-
rev-li
s
t
-
c
ulled-boun
d
ary' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Ha
m
an
o
Merge
branch 'm
m
/maint-log-n-with-dif
f
-fil
t
ering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Ha
m
ano
Merg
e
branch
'
jk/fo
r
mat-patch-m
u
ltiline
-
head
e
r' in
t
o
.
.
.
commit
|
commitdiff
|
tree
next