aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch,...Junio C Hamano2013-04-08
* Sync with 1.8.2.1Junio C Hamano2013-04-07
|\
| * Git 1.8.2.1v1.8.2.1Junio C Hamano2013-04-07
| * Sync with 1.8.1.6Junio C Hamano2013-04-07
| |\
| | * Git 1.8.1.6v1.8.1.6Junio C Hamano2013-04-07
| | * Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1Junio C Hamano2013-04-07
| | |\
| | * | remote-helpers/test-bzr.sh: do not use "grep '\s'"Torsten Bögershausen2013-04-07
* | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-07
* | | | Merge branch 'jk/rm-removed-paths'Junio C Hamano2013-04-07
|\ \ \ \
| * | | | t3600: document failure of rm across symbolic linksJeff King2013-04-04
| * | | | t3600: test behavior of reverse-d/f conflictJeff King2013-04-04
| * | | | rm: do not complain about d/f conflicts during deletionJeff King2013-04-04
* | | | | Merge branch 'tb/shared-perm'Junio C Hamano2013-04-07
|\ \ \ \ \
| * | | | | path.c: optimize adjust_shared_perm()Torsten Bögershausen2013-04-05
| * | | | | path.c: simplify adjust_shared_perm()Torsten Bögershausen2013-04-05
* | | | | | Merge branch 'cn/commit-amend-doc'Junio C Hamano2013-04-07
|\ \ \ \ \ \
| * | | | | | Documentation/git-commit: reword the --amend explanationCarlos Martín Nieto2013-04-05
* | | | | | | Merge branch 'fc/remote-helpers-test-updates'Junio C Hamano2013-04-07
|\ \ \ \ \ \ \
| * | | | | | | remote-hg: fix hg-git test-caseFelipe Contreras2013-04-04
| * | | | | | | remote-bzr: remove stale check code for testsFelipe Contreras2013-04-04
| * | | | | | | remote-helpers: fix the run of all testsFelipe Contreras2013-04-04
| * | | | | | | remote-bzr: avoid echo -nFelipe Contreras2013-04-04
* | | | | | | | Merge branch 'mg/texinfo-5'Junio C Hamano2013-04-07
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: Strip texinfo anchors to avoid duplicatesMartin von Gagern2013-04-03
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jk/diffcore-break-divzero'Junio C Hamano2013-04-07
|\ \ \ \ \ \ \ \
| * | | | | | | | diffcore-break: don't divide by zeroJohn Keeping2013-04-03
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/bisect-prn-unsigned'Junio C Hamano2013-04-07
|\ \ \ \ \ \ \ \
| * | | | | | | | bisect: avoid signed integer overflowJohn Keeping2013-04-03
| |/ / / / / / /
* | | | | | | | Merge branch 'rr/triangle'Junio C Hamano2013-04-07
|\ \ \ \ \ \ \ \
| * | | | | | | | remote.c: introduce branch.<name>.pushremoteRamkumar Ramachandra2013-04-02
| * | | | | | | | remote.c: introduce remote.pushdefaultRamkumar Ramachandra2013-04-02
| * | | | | | | | remote.c: introduce a way to have different remotes for fetch/pushRamkumar Ramachandra2013-04-02
| * | | | | | | | t5516 (fetch-push): drop implicit arguments from helper functionsJeff King2013-04-02
| * | | | | | | | t5516 (fetch-push): update test descriptionRamkumar Ramachandra2013-04-02
| * | | | | | | | remote.c: simplify a bit of code using git_config_string()Ramkumar Ramachandra2013-04-02
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mm/status-during-revert'Junio C Hamano2013-04-07
|\ \ \ \ \ \ \ \
| * | | | | | | | status: show commit sha1 in "You are currently reverting" messageMatthieu Moy2013-04-02
| * | | | | | | | status: show 'revert' state and status hintMatthieu Moy2013-04-02
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/set-upstream-error-cases'Junio C Hamano2013-04-07
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: give advice when tracking start-point is missingJeff King2013-04-02
| * | | | | | | | branch: mention start_name in set-upstream error messagesJeff King2013-04-02
| * | | | | | | | branch: improve error message for missing --set-upstream-to refJeff King2013-04-02
| * | | | | | | | branch: factor out "upstream is not a branch" error messagesJeff King2013-04-02
| * | | | | | | | t3200: test --set-upstream-to with bogus refsJeff King2013-04-02
* | | | | | | | | Merge branch 'jk/filter-branch-come-back-to-original'Junio C Hamano2013-04-07
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | filter-branch: return to original dir after filteringJeff King2013-04-02
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | gitremote-helpers(1): clarify refspec behaviourJohn Keeping2013-04-07
* | | | | | | | | fast-export: Allow pruned-references in mark fileAntoine Pelisse2013-04-07
* | | | | | | | | remote-bzr: add utf-8 support for pushingFelipe Contreras2013-04-07
* | | | | | | | | remote-bzr: add utf-8 support for fetchingTimotheus Pokorra2013-04-07