Git Rebase And Git Merge

Git Rebase git rebase [ []] git wiil go to another branch by command git checkout firstly and then apply the commits on it to area. We wiil start with the example showed in the last article Git Diff Different Branches git checkout master git rebase master dev After resolving Read more…

Git Diff Different Branches

We want to compare the current branch and another branch to find the changes since they diverged. For example, we create a new branch dev from branch master and add a few commits, the branch master also update after diverging. The common ancestor is in the following part. The following Read more…

Git Apply/Am Patch File

Create Patch Files Create simple Email-format files which contain commit content with git. For example, $ git format-patch -M origin/master -5 0001-remove-debug-dir.patch 0002-adjust-height.patch 0003-use-splitter-as-stackWidget-page.patch 0004-Make-gif-resize.patch 0005-add-resize-event.patch The patch file has UNIX mailbox format context which is convenient for e-mail submission or for use with git am, we can use command Read more…

Shell – Use cmake.exe and devenv.exe to build CPP project

Initial developing environment: “C:Program Files (x86)Microsoft Visual Studio 12.0VCvcvarsall.bat” x86 Use cmake to generate a project file. E:projectprivatedoubleView2>cmake ./ — Building for: Visual Studio 16 2019 — Selecting Windows SDK version 10.0.17763.0 to target Windows 10.0.17134. — The C compiler identification is MSVC 19.21.27702.2 — The CXX compiler identification is Read more…

JIT Debugger Tool Drmingw

The introduction of Just-in-Time (JIT) debugger tool drmingw: https://vroby.ddns.net/Public/sdlBasic/MinGW/doc/drmingw/drmingw.html It’s very easy to install this tool. We can download from the internet and unzip it: It’s necessary to put the directory of the tool bin in the environment variable Path on windows OS. After that, we can run drmingw.exe by Read more…

Tex To PDF
: convert the Latex file which suffix is tex to a PDF file

X