Hi.
Here is log:
git reset HEAD -p /home/kes/s/public/v2/js/contact_us.js
diff --git a/public/v2/js/contact_us.js b/public/v2/js/contact_us.js
index e05be6d0..d429d291 100644
--- a/public/v2/js/contact_us.js
+++ b/public/v2/js/contact_us.js
@@ -1,7 +1,19 @@
+
+
+function captchaProcess( form
Hi.
At next log:
$ git prb
POST git-upload-pack (948 bytes)
remote: Counting objects: 20, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 20 (delta 14), reused 0 (delta 0)
Unpacking objects: 100% (20/20), done.
>From https://tracker.feel-safe.net/gitdev/main
will not be exists after rebasing
some logs:
kes@work ~/s $ git tree
* 704f068f (HEAD -> 296_tos, back) Fix message
* 8d9aef32 Merge branch 'fix_login_form' into 296_tos
|\
| * f1c6616a Copy value over all contact
|/
* 528b8f0d Merge branch 'fix_profile' into 296_tos
$ git pull -v --rebase
>From
As you can see I have lost some commits. Thus I wanna an option to be safe
20.09.2018, 17:38, "Junio C Hamano" :
> KES writes:
>
>> PS. for `git push --force` there is alternative: --force-with-lease
>> Is there something similar to --force-with-lease but f
Hi.
TL;DR; Some local commits are lost while `git pull -v --rebase`
[alias]
tree= log --graph --decorate --pretty=oneline --abbrev-commit
changes = log --graph --decorate --pretty=oneline --abbrev-commit
--cherry-pick --boundary --left-right
$ git fetch origin
remote:
ah, sorry. I understand why.
The merge was on remote side.
21.06.2018, 12:37, "KES" :
> Hi.
>
> I am on my current branch:
>
> $ git log --graph --decorate --pretty=oneline --abbrev-commit
> * 5b85d64 (HEAD -> SCTT_for_other_tables) Implement script to te
Hi.
I am on my current branch:
$ git log --graph --decorate --pretty=oneline --abbrev-commit
* 5b85d64 (HEAD -> SCTT_for_other_tables) Implement script to test CORS
* f45a919 Create SCTT for Contractor
* 702fcdd (xtucha/SCTT_for_other_tables) Create SCTT for PartnershipAgreement
* 7e4cac9
ac9 Create SCTT for Language
* a0607d1 Fixed broken tests for 'Person'
* 1d0a1b2 Create SCTT for DocumentFile
* 92837c1 Fix SQL quoting problem
I want to pull new changes and apply mine on top of them
I do `git pull -v -r`
kes@work ~/t $ git pull -v -r amazon SCTT_for_other_tables
>From amazon:/v1
The `--cherry-pick` option states:
>Omit any commit that introduces the same change as another commit on the
>“other side”
For next git command I see next tree:
$ git log --graph --decorate --pretty=oneline --abbrev-commit --cherry-mark
--boundary --left-right
< bc2820d
I even can not drop local changes:
$ git checkout local.conf
error: pathspec 'local.conf' did not match any file(s) known to git.
$ git log local.conf
commit 6df8bab88fd703c6859954adc51b2abaad8f59ec
Author: Eugen Konkov <kes-...@yandex.ru>
Date: Wed May 9 15:31:02 2018 +0300
Imp
How to reproduce:
$ git update-index --skip-worktree conf/local.conf
$ git pull
Updating 0cd50c7..bde58f8
error: Your local changes to the following files would be overwritten by merge:
conf/local.conf
Please commit your changes or stash them before you merge.
Aborting
$ git stash save
No
uh... seems nobody is interested in this functionality (
06.03.2018, 17:46, "KES" <kes-...@yandex.ru>:
> Hi.
> I want to `Trace the evolution of the line range`.
> And not committed change is sort of evolution and should be taken into
> account by -L option.
>
Hi.
I want to `Trace the evolution of the line range`.
And not committed change is sort of evolution and should be taken into account
by -L option.
Currently I MUST `stash save` change,
look actual line number,
trace evolution,
`stash pop` to bring back current change.
EXPECTED:
Allow to
One yet more:
@@ -43,22 +44,25 @@ sub tariff_title {
1;
__DATA__
-@@ control/tariff.css
-* {
-margin: 0;
-padding: 0;
-border: 0;
--webkit-box-sizing: border-box;
-box-sizing: border-box; }
-html {
-background-color: #121212;
-color: white;
-font-family:
One yet more:
@@ -141,5 +86,9 @@
// }
- OP* o;
+ SV *tvs = newSVpvs( "ScalarHistory" );
+ SV *tva = newSVpvs( "ArrayHistory" );
+ SV *tvh = newSVpvs( "HashHistory" );
+
+ OP *o;
while( PL_op ) {
an Beller <sbel...@google.com> wrote:
>> On Mon, Nov 21, 2016 at 8:56 AM, Jacob Keller <jacob.kel...@gmail.com>
>> wrote:
>>> On Mon, Nov 21, 2016 at 12:11 AM, KES <kes-...@yandex.ru> wrote:
>>>> Hi.
>>>
>>> Hi,
>>>
>
> At this point, no, but in the future instead of --force use
> --force-with-lease=: where is e.g. $(git
> rev-parse HEAD).
Thank you.
But I have found next command to see what were changed.
For example if someone did forced push and I wanna see changes before merge
remote
git log --graph
> This happens *only* if the other developers also have somefile mentioned
> in their .gitignore.
It will be mentioned, because of I can add/push, wait developers pull, add/push
I can do this because I was angry or was fired. So this is my last "surprise"
for others ))
>> EXPECTED: git
e348241bfb9ba563c82d28c05d3f45ab9c1a765d
Author: Eugen Konkov <kes-...@yandex.ru>
Date: Fri Jan 5 15:58:17 2018 +0200
Wrap whole DB::DB into by moving DB::db into DB::interact
This allow us to not wrap each call into
diff --git a/lib/DB/Hooks.pm b/lib/DB/Hooks.pm
index 6ade20a..dabe701 100644
--- a/lib/DB/Ho
Hi.
I get often patches which can be minimized:
@@ -60,11 +64,8 @@ sub _get_filter {
address=> { -like => \[ '?', "%$search%" ] },
company=> { -like => \[ '?', "%$search%" ] },
country_code => { '=' => \[ 'UPPER(?)' => $search ] },
-]);
-$users =
Hi.
When I use `git pull -v --rebase` command under user I got this error:
POST git-upload-pack (947 bytes)
POST git-upload-pack (452 bytes)
remote: warning: unable to access '/root/.config/git/attributes': Permission
denied
remote: Counting objects: 4, done.
remote: Compressing objects: 100%
Hi.
That curious, but git allow to unconditionally delete files on other developer
host when he do `git pull`
How to reproduce:
1. File should be ignored:
echo "somefile" >> .gitignore
2. Add this ignored file into repository
git add -f somefile
3. Push changes to origin
git push
4. When
Hi. I have done `git push --force` but I forget to `pull`,
Counting objects: 7, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 765 bytes | 0 bytes/s, done.
Total 7 (delta 6), reused 0 (delta 0)
To xxxgit:cry/cry.git
+
Hi. I have merge conflict and this output:
--- a/crypto/lib/Crypto/Routes.pm
+++ b/crypto/lib/Crypto/Routes.pm
@@@ -98,17 -94,16 +98,36 @@@ sub register
,payment_cancel_landing => '/payment-cancel'
}});
# Route configuration is moved from plugin:
++<<< ours
+
http://stackoverflow.com/questions/3040833/stash-only-one-file-out-of-multiple-files-that-have-changed-with-git#comment32451416_3040833
Sometimes poople are forced to save stash for changed files. But there is no
such option (
I suppose this is some bug. Because `Segmentation fault` is not expected in any
case
http://stackoverflow.com/questions/41362676/how-to-resolve-merge-conflict-while-rebasing
Hi.
I have some question about how diff works then give proposal:
it will be very useful for each "symbol" store additional meta info as source
line length. So in this case when git counter two equal sequence of commands it
will do further comparison: Adds 23 chars deletes none VS adds 75
Does it be more meaning full which change was done when diff will be displayed
as:
@@ -1278,6 +1311,16 @@ sub process {
if( ref $result eq 'HASH' ) {
$code = $result->{ code };
@args = DB::eval( $result->{ expr } );
I have patch:
diff --git a/t b/t
index ced22c4..992533b 100644
--- a/t
+++ b/t
@@ -1,2 +1,2 @@
asdf
-asdf
\ No newline at end of file
+asdf
When I commit it I do not see it at log:
commit 1efee9908a734c40194ffc07e7793afd2e386fbc
Author: x
Date: Wed Sep 7 11:09:04 2016 +0300
asdf
commit
Hi
When we do git pull -v --rebase
We got this:
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 7 (delta 5), reused 0 (delta 0)
Unpacking objects: 100% (7/7), done.
>From ssh://slab/alexclear/ontico
2b541e2..2c17d76 master -> origin/master
Hi
For this diff
diff --git a/app/public/v2/index.html b/app/public/v2/index.html
index f73ba73..3af0c64 100644
--- a/app/public/v2/index.html
+++ b/app/public/v2/index.html
@@ -21,11 +21,15 @@
-
- MOV
- ADD
- DEL
-
+
+
+ MOV
+ ADD
Hi.
How to reproduce
$ git-number
On branch master
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)
1 modified: ../lib/Devel/DebugHooks.pm
2 modified:
Hi.
**To not apply big patches, I will supply links to public repository
Lets start
1. git clone https://github.com/KES777/Plack
2. git show ed485bf75a6
Nothing interesting. Usual merge conflict while merge branch
'feature/doc_contribute' to 'master'
But I was interested by this part:
When after editing I get this:
mdi.Application= this;
mdi.Class.TApplication.baseConstructor.apply( this, arguments );
git diff shows:
mdi.Application= this;
- mdi.Class.TApplication.baseConstructor.apply( this, arguments );
- //We must not create/show application node because of this
Пересылаемое сообщение
06.04.2015, 15:12, KES kes-...@yandex.ua:
$ pwd
/data/mdi2/classes
$ git blame -L22,+1 -- utils.js
99b7a802 mdi2/utils.js (user 2015-03-26 21:54:57 +0200 22) #comment
$ git blame -L22,+1 99b7a802^ -- utils.js
fatal
When after editing I get this:
mdi.Application= this;
mdi.Class.TApplication.baseConstructor.apply( this, arguments );
git diff shows:
mdi.Application= this;
- mdi.Class.TApplication.baseConstructor.apply( this, arguments );
- //We must not create/show application node because of this is
$ pwd
/data/mdi2/classes
$ git blame -L22,+1 -- utils.js
99b7a802 mdi2/utils.js (user 2015-03-26 21:54:57 +0200 22) #comment
$ git blame -L22,+1 99b7a802^ -- utils.js
fatal: no such path mdi2/classes/utils.js in 99b7a802^
As you have noticed, the file were in different
37 matches
Mail list logo
