jnareb

%%% Proszę zwrócić uwagę na komentarze! %%%

%% fonty programistyczne, o stałej szerokości znaków
%% jeden z poniższych
\ifcase 0 % 0-3
%     0
%% użycie domyślnego fontu o stałej szerokości znaków (monospace)
\or % 1
%% dosyć wąski font stałej szerokości Inconsolata, do druku kodu
%% niestety bez czcionki pochyłej w foncie

jnareb

void MainWindow::loadImageFromFile(QString filename, QImage *dstImage)
{
    QImage *tempImage = new QImage(filename);
    *dstImage = tempImage->copy(0,0,dstImage->width(),dstImage->height());
    delete tempImage;
}

void MainWindow::openImageFile(QImage *dstImage)
{
    QString filename = QFileDialog::getOpenFileName(

jnareb

void MainWindow::delay(int ms)
{
    QTime endTime = QTime::currentTime().addMSecs(ms);
    while (QTime::currentTime() < endTime)
        QCoreApplication::processEvents(QEventLoop::AllEvents, 100 /* maxtime in ms */);
}

jnareb

Rough timeline

• Re: What's cooking in git.git (Jan 2018, #03; Tue, 23) by Jeff Hostetler, 24 Jan 2018 -- announcement that Derrick Stolee is working on the commit-graph feature

• [PATCH 00/14] Serialized Commit Graph by Derrick Stolee, 25 Jan 2018 -- first version of first patch series (ds/commit-graph)

• Git Merge contributor summit notes by Alex Vandiver, 9 Mar 2018 -- in Git Rev News Edition 37

jnareb

/* https://lwn.net/Articles/748870/ */

#define __single_eval_max(t1, t2, max1, max2, x, y) ({	\
    t1 max1 = (x);					\
    t2 max2 = (y);					\
    (void) (&max1 == &max2);			\
    max1 > max2 ? max1 : max2; })

#define __max(t1, t2, x, y)						\
    __builtin_choose_expr(__builtin_constant_p(x) &&		\

jnareb

$ git push
To https://git.company.com/repo.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://git.company.com/repo.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

jnareb

$ git push --force-with-lease
Counting objects: 3, done.
Writing objects: 100% (3/3), 269 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To https://git.company.com/repo.git
 + 3fb00bd...8d110bd master -> master (forced update)

jnareb

$ git commit -a --amend
[...]
$ git push
To https://git.company.com/repo.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://git.company.com/repo.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g. 'git pull ...')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

jnareb

$ git push
Counting objects: 48, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (6/6), 1469 bytes | 0 bytes/s, done.
Total 48 (delta 0), reused 0 (delta 0)
To https://git.company.com/repo.git
   f30abad..3fb00bd master -> master

jnareb

export PROMPT_COMMAND='if [ "$(id -u)" -ne 0 ]; then echo "$(date "+%Y-%m-%d.%H:%M:%S") $(pwd) $(history 1)" >> ~/.logs/bash-history-$(date "+%Y-%m-%d").log; fi'