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
Merge branch 'da/difftool-test'
2012-04-16
Junio C Hamano
Merge branch
'd
a
/difftool-test'
commit
|
commitdiff
|
tree
2012-04-16
J
u
nio C
Hamano
Mer
g
e
b
ranch 'zj/t
e
st-cred-he
l
per-nicer-prove'
commit
|
commitdiff
|
tree
2012-04-16
Juni
o
C Haman
o
Merge
br
a
nch
'jh/
n
o
tes
-
merge-in
-
git-di
r
-
wor
k
tree'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Merge b
r
anch '
t
r/ma
i
nt-word-d
i
f
f
-
regex-sticky'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Me
r
ge bran
c
h 'j
n
/di
f
fstat-tests'
commit
|
commitdiff
|
tree
2012-04-16
J
u
nio
C
H
amano
M
e
rge branch
'
jc/d
i
f
f
-algo-cleanup'
commit
|
commitdiff
|
tree
2012-04-16
Junio C H
a
m
ano
Merge
bran
c
h
'
jc/commit-
h
o
o
k-authorship'
commit
|
commitdiff
|
tree
2012-04-16
Juni
o
C
Haman
o
Mer
g
e bran
c
h 'nd/stream-mo
r
e
'
commit
|
commitdiff
|
tree
2012-04-16
C
lemen
s
Buchacher
merge overwri
t
es unstaged ch
a
nges in renamed f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-11
J
u
n
i
o
C Hamano
Kick off post 1
.
7
.
10 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-11
Sebastian Pipping
g
i
tweb: Fix unintend
e
d "--no-merg
e
s" for regular Atom
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
Junio
C
Haman
o
Merge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merg
e
bra
n
c
h 'm
a
int-1
.
7
.
9
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-04-10
Junio C Ha
m
ano
Merge
b
ranch 'mai
n
t-1
.
7
.
8' i
n
to maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Sch
a
rfe
test
-
s
ubproce
s
s: fix segfault
with
o
ut argumen
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
René S
c
harfe
submodule:
fix prototype of gitmodules_config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-09
J
un
i
o C Ham
a
no
Me
r
ge branch 'jc/
m
aint-verify-obje
c
ts-
r
emo
v
e-pe
s
s
i
mism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
amano
M
e
rge
b
ranch '
d
w
/
gitweb-doc-grammo' i
n
to maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge
bra
n
ch
'
tr/cache-t
r
ee' i
n
to ma
i
nt-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
no
M
e
r
g
e branch '
c
b/m
a
int-t554
1
-
make-
s
erver-port-portab
l
e
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Hamano
M
e
rge branch 'cn/maint-rev-list-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C Hamano
Merge branch 'tr/maint-bu
n
dl
e
-boundary' in
t
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C H
a
mano
Mer
g
e br
a
nch 'tr/ma
i
nt
-
b
un
d
le-lon
g
-su
b
ject' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
ama
n
o
M
erge branch 'ph/rerere-d
o
c'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Junio
C Hamano
Gi
t
1
.
7
.
1
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-06
Fel
i
pe
C
on
t
re
r
a
s
spec:
a
dd miss
i
n
g build
d
ependency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-03
Junio C
Hamano
Gi
t
1
.
7
.
10-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io C Hama
n
o
Merge branch 'pt/gitk'
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Sync with
1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
J
unio C Hamano
Git 1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Junio C H
a
mano
M
erge bran
c
h 'jc/maint-merge-autoedi
t
' into
maint
commit
|
commitdiff
|
tree
2012-04-02
Pat
T
hoyts
gitk:
fix
setting font di
s
play with new tabbed dialog
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Pat Tho
y
ts
gitk: fix tabbed
p
references co
n
s
truction when using
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Junio C
Hamano
Merge git://github
.
c
o
m/git-l10n/g
i
t-po
commit
|
commitdiff
|
tree
2012-03-31
Junio
C
Hamano
Merg
e
branch 'maint
'
commit
|
commitdiff
|
tree
2012-03-30
Heiko Voigt
string-list
:
doc
u
ment th
a
t
s
tring_list_i
n
s
ert() ins
e
rts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-28
René Scharfe
confi
g
: r
e
move
u
seles
s
assignmen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-28
Junio C Hamano
Git 1
.
7
.
10-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-28
Jim
M
eyering
correct a few d
o
ubled-word nits in comments and
d
o
cumentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-28
J
im Meyeri
n
g
cor
r
ect spelling: an URL -
>
a URL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-27
Junio
C
Hamano
l10n
u
p
dates for Git 1
.
7
.
10-rc1
commit
|
commitdiff
|
tree
2012-03-27
Z
b
igni
e
w Jęd
r
zeje
w
sk
.
.
.
tests:
uns
e
t C
O
LUMNS inh
e
r
i
t
ed f
r
om environm
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ha
m
ano
Update draft rel
e
ase notes to 1
.
7
.
10
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C
H
amano
Sync with 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Hamano
Git 1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Merge branch
'jn
/
maint-fast-import-empty-
l
s' into mai
n
t
commit
|
commitdiff
|
tree
2012-03-26
Junio
C Hamano
Merge branch 'ph/
r
erere-doc' into maint
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o
C Hamano
Mer
g
e
branc
h
'm
s
/ma
i
n
t
-config-error-at-eol
-
linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark L
o
dato
grep
d
oc:
a
dd --
b
re
a
k / -
-
heading
/ -W to synopsis
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
R
o
drigo Sil
v
a (Mestr
.
.
.
Documentatio
n
: improve description of
GIT_EDIT
O
R
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Nelson Benitez Leon
documenta
t
ion: fix alph
a
beti
c
o
r
dered list for git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-24
Junio C H
a
ma
n
o
Merge
g
itk changes fr
o
m Paul M
a
ckerras at
g
it://ozlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Ju
n
io C Ha
m
ano
Git 1
.
7
.
10-r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
J
u
nio C
Ham
a
n
o
.
mailmap:
unify
various old mail addresses
o
f gitster
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
Junio C
H
amano
M
e
rge branch 'am
/
comp
l
e
ti
o
n-
z
s
h
-fix'
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
M
e
rge branch 'd
w
/gitweb-doc-gramm
o
'
commit
|
commitdiff
|
tree
2012-03-23
D Wa
i
tzman
Documentation/gitweb: trivi
a
l English fixes
commit
|
commitdiff
|
tree
2012-03-21
A
l
ex M
e
r
ry
c
o
ntrib/completion: "local var=()" is misinterpreted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
M
erge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C H
a
m
ano
Merge bra
n
ch 'maint-1
.
7
.
8'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C
H
amano
m
e
rge: backport GIT_MER
G
E_AUTOEDI
T
support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ham
a
no
Merge br
a
nc
h
'ks/sort-wil
d
card
-
i
n
-makefile' into
m
ai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch
'jc/advis
e
-i18n' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio
C Hama
n
o
Merge bra
n
ch 'j
n
/g
i
tweb-unspecified-action' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-19
David Ag
u
il
a
r
t7800: Test
difft
o
ol passing argum
e
nts to diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-16
J
unio
C H
a
mano
Me
r
ge branch 'ab/perl-i18n'
commit
|
commitdiff
|
tree
2012-03-16
Ævar Arnfjör
ð
B
j
ar
m
ason
p
er
l
/Makefile: install Git::I18N unde
r
NO
_
PERL_MAKEMAKER
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
U
pdate dr
a
ft
release notes to 1
.
7
.
10
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-16
Junio C Ham
a
no
M
e
rge branch 'th
/
mergetools-delt
a
walker'
commit
|
commitdiff
|
tree
2012-03-16
Junio
C
Hamano
Mer
g
e bra
n
ch 'jc/mai
n
t-verif
y
-objects-r
e
mov
e
-
p
e
s
simi
s
m'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Mer
g
e b
r
anch 'sl/customize-sane-tool
-
path'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Ha
m
ano
Merge "two fixes for fas
t
-import's 'l
s
' command" f
r
om
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Juni
o
C Hamano
Merge branch
'
t
h/git-diffa
l
l'
commit
|
commitdiff
|
tree
2012-03-16
Junio
C
Hamano
M
e
rge branch '
t
h
/
doc-diff-subm
o
dule-option'
commit
|
commitdiff
|
tree
2012-03-15
Junio C Haman
o
fetch/receive: remove over
-
pessimisti
c
connecti
v
ity
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Tim He
n
igan
D
o
cum
e
ntation/
d
iff
t
o
o
l: add deltawalke
r
to lis
t
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
r
l
and
notes-me
r
ge: Don't remove
.
git/NOTES_MERGE_WORKTREE
.
.
.
Inspired-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
note
s
-merge: use
o
pendir/r
e
addir instea
d
of
u
sing
r
e
ad_direc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310: i
l
l
ustrate
f
ailure to "notes me
r
ge --commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Ju
n
i
o C Hamano
re
m
ov
e
_dir_recursively(): Add flag for skippin
g
removal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Zbigniew Jędrz
e
jewsk
.
.
.
t0303:
resu
r
r
ect
c
ommit m
e
ssag
e
as
t
est documen
t
a
t
io
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Zbigniew Jędrzejewsk
.
.
.
t0303
:
imm
e
diatel
y
ba
i
l out w/o
GIT_T
E
ST_CREDENTIAL_HELPER
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Junio C Hama
n
o
Git 1
.
7
.
10-
r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim
Henigan
co
n
trib/diffall: f
i
x cleanup trap
o
n Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim Hen
i
gan
contrib/diffall
:
el
i
m
i
n
ate du
p
licate wh
i
le loops
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim
H
enigan
contrib/diffall: eliminate use of t
a
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Ti
m
Henigan
contri
b
/
diffall: cr
e
ate tmp
d
irs
w
i
t
h
o
ut mkt
e
mp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
contrib/diffal
l
:
c
omment
ac
t
ual reas
o
n for
'
c
dup
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Thomas Ra
s
t
dif
f
:
tweak a _c
o
py_ of diff_opt
i
ons with word-
d
iff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Thomas Rast
d
i
ff: refactor
t
he word-dif
f
setup from builti
n
_diff_cmd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Johannes S
i
xt
t
4
03
4
:
d
iff
.
*
.
wordregex s
h
ould no
t
be "
s
ticky" in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
T
im Henigan
Document
a
tion
/
diff-options: rew
o
rd description of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
Jonathan Nieder
d
iffstat
s
ummary line v
a
ri
e
s by locale
:
miscellany
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
Jonathan Nie
d
e
r
test: use num
s
t
a
t
inste
a
d of diffstat
i
n bin
a
r
y
-dif
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
Jonathan
N
i
eder
t
e
st: use --nu
m
stat inste
a
d of --stat in "git stash
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
J
o
n
athan Nieder
test: test cherry-pick functionality
a
nd out
p
ut separat
e
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
Jonathan
Nieder
test: moderni
z
e
funny-n
a
mes test style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
J
o
nathan Nieder
t
e
st: use nums
t
at inst
e
ad of d
i
f
fstat
i
n funny-names
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
Jonathan Nieder
test: use test
_
i18
n
cmp when
c
hecking --st
a
t output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
J
unio C Ham
a
no
Merge branch
'jc/
i
1
8n-shell-sc
r
ipt-gett
e
xt'
commit
|
commitdiff
|
tree
next